Retrieve submission metadata

go.mod

@@ -4,6 +4,7 @@ go 1.16
 
 require (
 	github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895
+	github.com/aws/aws-sdk-go v1.44.91
 	github.com/coreos/go-oidc/v3 v3.2.0
 	github.com/drone/drone-go v1.7.1
 	github.com/gin-gonic/gin v1.7.7

go.sum

@@ -61,6 +61,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE
 github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895 h1:NsReiLpErIPzRrnogAXYwSoU7txA977LjDGrbkewJbg=
 github.com/ProtonMail/go-crypto v0.0.0-20220824120805-4b6e5c587895/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/aws/aws-sdk-go v1.44.91 h1:SRWmuX7PTyhBdLuvSfM7KWrWISJsrRsUPcFDSFduRxY=
+github.com/aws/aws-sdk-go v1.44.91/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -226,6 +228,9 @@ github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE
 github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0=
 github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=
 github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
@@ -248,6 +253,7 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OH
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=

repositories.go

@@ -1,14 +1,21 @@
 package main
 
 import (
+	"encoding/json"
 	"flag"
 	"fmt"
 	"log"
 	"net/http"
+	"os"
+	"path"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/drone/drone-go/drone"
 	"github.com/gin-gonic/gin"
 	"golang.org/x/oauth2"
@@ -18,11 +25,35 @@ var (
 	droneToken    = ""
 	droneConfig   *http.Client
 	droneEndpoint string
+	s3_endpoint   string
+	s3_region     = "us"
+	s3_bucket     string
+	s3_access_key string
+	s3_secret_key string
+	s3_path_style bool
 )
 
 func init() {
 	flag.StringVar(&droneToken, "drone-token", droneToken, "Token for Drone Oauth")
 	flag.StringVar(&droneEndpoint, "drone-endpoint", droneEndpoint, "Drone Endpoint")
+
+	s3_endpoint, _ = os.LookupEnv("S3_ENDPOINT")
+	if region, ok := os.LookupEnv("S3_REGION"); ok {
+		s3_region = region
+	}
+	s3_bucket, _ = os.LookupEnv("S3_BUCKET")
+	s3_access_key, _ = os.LookupEnv("S3_ACCESS_KEY")
+	s3_secret_key, _ = os.LookupEnv("S3_SECRET_KEY")
+	if path_style, ok := os.LookupEnv("S3_PATH_STYLE"); ok {
+		s3_path_style = path_style == "1" || path_style == "ON" || path_style == "on" || path_style == "TRUE" || path_style == "true" || path_style == "yes" || path_style == "YES"
+	}
+
+	flag.StringVar(&s3_endpoint, "s3-endpoint", s3_endpoint, "When using S3 backend, endpoint to use")
+	flag.StringVar(&s3_region, "s3-region", s3_region, "When using S3 backend, region to use")
+	flag.StringVar(&s3_bucket, "s3-bucket", s3_bucket, "When using S3 backend, bucket to use")
+	flag.StringVar(&s3_access_key, "s3-access-key", s3_access_key, "When using S3 backend, Access Key")
+	flag.StringVar(&s3_secret_key, "s3-secret-key", s3_secret_key, "When using S3 backend, Secret Key")
+	flag.BoolVar(&s3_path_style, "s3-path-style", s3_path_style, "When using S3 backend, force path style (when using minio)")
 }
 
 func initializeDroneOauth() {
@@ -37,6 +68,15 @@ func initializeDroneOauth() {
 	}
 }
 
+func s3NewSession() (*session.Session, error) {
+	return session.NewSession(&aws.Config{
+		Credentials:      credentials.NewStaticCredentials(s3_access_key, s3_secret_key, ""),
+		Endpoint:         aws.String(s3_endpoint),
+		Region:           aws.String(s3_region),
+		S3ForcePathStyle: &s3_path_style,
+	})
+}
+
 func declareAPIAuthRepositoriesRoutes(router *gin.RouterGroup) {
 	router.GET("/repositories", func(c *gin.Context) {
 		var u *User
@@ -201,6 +241,48 @@ func declareAPIAuthRepositoriesRoutes(router *gin.RouterGroup) {
 		c.JSON(http.StatusOK, result)
 
 	})
+
+	repositoriesRoutes.GET("/submission", func(c *gin.Context) {
+		var u *User
+		if user, ok := c.Get("user"); ok {
+			u = user.(*User)
+		} else {
+			u = c.MustGet("LoggedUser").(*User)
+		}
+		repo := c.MustGet("repository").(*Repository)
+		work, err := getWork(int(repo.IdWork))
+		if err != nil {
+			c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "Unable to find related work."})
+			return
+
+		}
+
+		s, err := s3NewSession()
+		if err != nil {
+			c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "Something goes wrong."})
+			return
+		}
+
+		log.Println(path.Join(fmt.Sprintf("%d", work.Id), fmt.Sprintf("rendu-%s.metadata", u.Login)))
+		result, err := s3.New(s).GetObject(&s3.GetObjectInput{
+			Bucket: aws.String(s3_bucket),
+			Key:    aws.String(path.Join(fmt.Sprintf("%d", work.Id), fmt.Sprintf("rendu-%s.metadata", u.Login))),
+		})
+		if err != nil {
+			c.AbortWithStatusJSON(http.StatusNotFound, gin.H{"errmsg": "Submission not found."})
+			return
+		}
+
+		tmp := map[string]interface{}{}
+		err = json.NewDecoder(result.Body).Decode(&tmp)
+		if err != nil {
+			log.Println("Unable to decode JSON metadata:", err.Error())
+			c.AbortWithStatusJSON(http.StatusNotFound, gin.H{"errmsg": "Submission not found."})
+			return
+		}
+
+		c.JSON(http.StatusOK, tmp)
+	})
 }
 
 func repositoryHandler(c *gin.Context) {

ui/src/components/WorkRepository.svelte

@@ -70,6 +70,14 @@
                             {:else}
                                 {state.status}
                             {/if}
+                        {/await}<br>
+                        Rendu&nbsp;:
+                        {#await repo.getSubmission()}
+                            <div class="spinner-grow spinner-grow-sm mx-1" role="status"></div>
+                        {:then submission}
+                            <strong>{submission.commit} ({submission.tag})</strong> (taille&nbsp;: {submission.size}&nbsp;o, date&nbsp;: <DateFormat date={new Date(submission.date)} dateStyle="medium" timeStyle="medium" />)
+                        {:catch}
+                            <strong>-</strong>
                         {/await}
                     </div>
                 </div>

ui/src/lib/repositories.js

@@ -36,6 +36,17 @@ export class WorkRepository {
     }
   }
 
+  async getSubmission() {
+    const res = await fetch(`api/repositories/${this.id}/submission`, {
+      headers: {'Accept': 'application/json'}
+    });
+    if (res.status == 200) {
+      return await res.json();
+    } else {
+      throw new Error((await res.json()).errmsg);
+    }
+  }
+
   async retrieveWork() {
     const res = await fetch(`api/repositories/${this.id}/trigger`, {
       method: 'POST',