updated stageTime-server 24.0220.1509 for tag version v0.4.55

go.mod

@@ -8,8 +8,8 @@ require (
 	github.com/nitishm/go-rejson/v4 v4.1.1-0.20230331060235-d2aa875760e4
 	github.com/redis/go-redis/v9 v9.0.5
 	github.com/stretchr/testify v1.8.4
-	github.com/stuttgart-things/sthingsBase v0.1.30
-	github.com/stuttgart-things/sthingsCli v0.1.80
+	github.com/stuttgart-things/sthingsBase v0.1.35
+	github.com/stuttgart-things/sthingsCli v0.1.87
 	github.com/stuttgart-things/sthingsK8s v0.1.19
 	go.hein.dev/go-version v0.1.0
 	google.golang.org/grpc v1.59.0
@@ -42,6 +42,7 @@ require (
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
@@ -65,9 +66,10 @@ require (
 	github.com/google/cel-go v0.18.1 // indirect
 	github.com/google/gnostic v0.6.9 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-github v17.0.0+incompatible // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.4.0 // indirect
+	github.com/google/uuid v1.5.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -86,6 +88,8 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
 	github.com/kyokomi/emoji/v2 v2.2.11 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -95,6 +99,9 @@ require (
 	github.com/mattn/goveralls v0.0.12 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
+	github.com/minio/md5-simd v1.1.2 // indirect
+	github.com/minio/minio-go/v7 v7.0.66 // indirect
+	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -113,6 +120,7 @@ require (
 	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/prometheus/statsd_exporter v0.21.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/rs/xid v1.5.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/schollz/progressbar/v3 v3.13.1 // indirect

go.sum

@@ -138,6 +138,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU=
 github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE=
 github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
@@ -266,6 +268,8 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-containerregistry v0.16.1 h1:rUEt426sR6nyrL3gt+18ibRcvYpKYdpsa5ZW7MA08dQ=
+github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
+github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -288,8 +292,8 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJY
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
-github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
+github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
@@ -366,6 +370,11 @@ github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
+github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
+github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
@@ -406,6 +415,12 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zk
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
+github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
+github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
+github.com/minio/minio-go/v7 v7.0.66 h1:bnTOXOHjOqv/gcMuiVbN9o2ngRItvqE774dG9nq0Dzw=
+github.com/minio/minio-go/v7 v7.0.66/go.mod h1:DHAgmyQEGdW3Cif0UooKOyrT3Vxs82zNdV6tkKhRtbs=
+github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
+github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
@@ -496,6 +511,8 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
+github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -560,10 +577,10 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stuttgart-things/redisqueue v0.0.0-20230628084515-1d31f7874df7 h1:nVooDvBYhBPQysVjbvWP3S1CQgmNG/Vovt+ahmv9Cas=
 github.com/stuttgart-things/redisqueue v0.0.0-20230628084515-1d31f7874df7/go.mod h1:RhH+7myjNLGs/BFeYO5U7ekmM7OsymsIOUN/DkewR3g=
-github.com/stuttgart-things/sthingsBase v0.1.30 h1:VUZxJIDGG/FnOZGDOH+VnjVfatK4nntGHBv+W3YyZUE=
-github.com/stuttgart-things/sthingsBase v0.1.30/go.mod h1:W5FmSsDZBfm1wfD/RO91N/nbB8ACGbC4eBBd1ALqIx8=
-github.com/stuttgart-things/sthingsCli v0.1.80 h1:tHjtB+AmUJ0ZGb0vv0CfrDWbmiDxFlPKSVIvB1y5boQ=
-github.com/stuttgart-things/sthingsCli v0.1.80/go.mod h1:4R6ldRRjyv73bz6QxhFz8sBV512VppndEl/jWNrkzVM=
+github.com/stuttgart-things/sthingsBase v0.1.35 h1:DmWx6m9R3xAGZfxaKlQLK8rqLKzclNhm4ehWAZMXjtg=
+github.com/stuttgart-things/sthingsBase v0.1.35/go.mod h1:W5FmSsDZBfm1wfD/RO91N/nbB8ACGbC4eBBd1ALqIx8=
+github.com/stuttgart-things/sthingsCli v0.1.87 h1:KKECXjSwDLrbIle90gA0ljmY/XmXNIx+90hDf1GERE8=
+github.com/stuttgart-things/sthingsCli v0.1.87/go.mod h1:dWLvo8NK4GMFVlyrvl/MUgWdN8X/1mPPWJN9S0SDQVw=
 github.com/stuttgart-things/sthingsK8s v0.1.19 h1:t7Da/VFPggl3lmWhFh6oHgKf0BJc+VHRV8svii+BCbI=
 github.com/stuttgart-things/sthingsK8s v0.1.19/go.mod h1:lz9VZNcD1jUd0Wb9HLrtyFV46rpzAaV3F2ROoWPSJCo=
 github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=

helm/stagetime-server/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: stagetime-server
 description: A Helm chart for Kubernetes
 type: application
-version: v0.4.54
-appVersion: v0.4.54
+version: v0.4.55
+appVersion: v0.4.55
 dependencies:
   - name: sthings-helm-toolkit
     version: 2.4.58

helm/stagetime-server/values.yaml

@@ -31,7 +31,7 @@ deployment:
       image: scr.cd43.sthings-pve.labul.sva.de/stagetime-server/stagetime-server
       replicaCount: 1
       imagePullPolicy: Always
-      tag: 24.0220.1458-v0.4.54
+      tag: 24.0220.1509-v0.4.55
       securityContext:
         capabilities: {}
 services:

helmfile.yaml

@@ -11,7 +11,7 @@ releases:
     installed: true
     namespace: stagetime
     chart: stagetime-server/stagetime-server
-    version: v0.4.54
+    version: v0.4.55
     values:
       - "env/values.yaml.gotmpl"
 environments:

server/printing.go

@@ -71,27 +71,29 @@ func SetStage(stages map[string]int, stage string) (updatedValue int) {
 	return
 }
 
-func GetPipelineRunStatus(jsonKey string, redisJSONHandler *rejson.Handler) PipelineRunStatus {
+func GetPipelineRunStatus(jsonKey string, redisJSONHandler *rejson.Handler) (pipelineRunStatus PipelineRunStatus) {
 
-	pipelineRunStatusJson := sthingsCli.GetRedisJSON(redisJSONHandler, jsonKey)
-	pipelineRunStatus := PipelineRunStatus{}
+	pipelineRunStatusJson, jsonExists := sthingsCli.GetRedisJSON(redisJSONHandler, jsonKey)
+	if jsonExists {
 
-	err := json.Unmarshal(pipelineRunStatusJson, &pipelineRunStatus)
-	if err != nil {
-		fmt.Println("FAILED TO JSON UNMARSHAL")
+		err := json.Unmarshal(pipelineRunStatusJson, &pipelineRunStatus)
+		if err != nil {
+			fmt.Println("FAILED TO JSON UNMARSHAL")
+		}
 	}
-
 	return pipelineRunStatus
 }
 
-func GetStageStatus(jsonKey string, redisJSONHandler *rejson.Handler) StageStatus {
+func GetStageStatus(jsonKey string, redisJSONHandler *rejson.Handler) (stageStatus StageStatus) {
+
+	stageStatusJson, jsonExists := sthingsCli.GetRedisJSON(redisJSONHandler, jsonKey)
 
-	stageStatusJson := sthingsCli.GetRedisJSON(redisJSONHandler, jsonKey)
-	stageStatus := StageStatus{}
+	if jsonExists {
 
-	err := json.Unmarshal(stageStatusJson, &stageStatus)
-	if err != nil {
-		fmt.Println("FAILED TO JSON UNMARSHAL")
+		err := json.Unmarshal(stageStatusJson, &stageStatus)
+		if err != nil {
+			fmt.Println("FAILED TO JSON UNMARSHAL")
+		}
 	}
 
 	return stageStatus

server/producing.go

@@ -77,15 +77,17 @@ func OutputRevisonRunStatus(renderedPipelineruns map[int][]string) {
 // GET REVISIONRUN STATUS FROM REDIS
 func GetRevisionRunFromRedis(redisJSONHandler *rejson.Handler, revisionRunStatusID string, print bool) (revisionRunFromRedis RevisionRunStatus) {
 
-	revisionRunStatus := sthingsCli.GetRedisJSON(redisJSONHandler, revisionRunStatusID)
+	revisionRunStatus, jsonExists := sthingsCli.GetRedisJSON(redisJSONHandler, revisionRunStatusID)
 
-	err := json.Unmarshal(revisionRunStatus, &revisionRunFromRedis)
-	if err != nil {
-		log.Fatalf("FAILED TO JSON UNMARSHAL REVISIONRUN STATUS")
-	}
+	if jsonExists {
+		err := json.Unmarshal(revisionRunStatus, &revisionRunFromRedis)
+		if err != nil {
+			log.Fatalf("FAILED TO JSON UNMARSHAL REVISIONRUN STATUS")
+		}
 
-	if print {
-		PrintTable(revisionRunFromRedis)
+		if print {
+			PrintTable(revisionRunFromRedis)
+		}
 	}
 
 	return
@@ -94,17 +96,19 @@ func GetRevisionRunFromRedis(redisJSONHandler *rejson.Handler, revisionRunStatus
 // GET STAGE STATUS FROM REDIS
 func GetStageFromRedis(redisJSONHandler *rejson.Handler, stageID string, print bool) (stageStatus StageStatus) {
 
-	revisionRunStatus := sthingsCli.GetRedisJSON(redisJSONHandler, stageID)
+	revisionRunStatus, jsonExists := sthingsCli.GetRedisJSON(redisJSONHandler, stageID)
 
-	err := json.Unmarshal(revisionRunStatus, &stageStatus)
-	if err != nil {
-		log.Fatalf("FAILED TO JSON UNMARSHAL STAGE STATUS")
-	}
+	if jsonExists {
 
-	if print {
-		PrintTable(stageStatus)
-	}
+		err := json.Unmarshal(revisionRunStatus, &stageStatus)
+		if err != nil {
+			log.Fatalf("FAILED TO JSON UNMARSHAL STAGE STATUS")
+		}
 
+		if print {
+			PrintTable(stageStatus)
+		}
+	}
 	return
 }