Improve Auditing

.github/workflows/merge.yaml

@@ -5,8 +5,6 @@ on:
     - main
     tags-ignore:
     - '*'
-env:
-  GO_VERSION: 1.21.5
 jobs:
   Coverage:
     runs-on: ubuntu-latest
@@ -16,7 +14,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v3
       with:
-        go-version: ${{ env.GO_VERSION }}
+        go-version-file: go.mod
         cache: true
     - name: Install Helm
       uses: azure/setup-helm@v3

.github/workflows/pull-request.yaml

@@ -6,8 +6,6 @@ on:
     - synchronize
     - reopened
     - ready_for_review
-env:
-  GO_VERSION: 1.22.5
 jobs:
   Static:
     runs-on: ubuntu-latest
@@ -17,7 +15,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v3
       with:
-        go-version: ${{ env.GO_VERSION }}
+        go-version-file: go.mod
         cache: true
     - name: Touch
       run: make touch
@@ -35,7 +33,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v3
       with:
-        go-version: ${{ env.GO_VERSION }}
+        go-version-file: go.mod
         cache: true
     - name: Install Helm
       uses: azure/setup-helm@v3

.github/workflows/release.yaml

@@ -6,7 +6,6 @@ on:
     tags:
     - '*'
 env:
-  GO_VERSION: 1.22.5
   REGISTRY: ghcr.io
 jobs:
   release:
@@ -19,7 +18,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v3
       with:
-        go-version: ${{ env.GO_VERSION }}
+        go-version-file: go.mod
         cache: true
     - name: Install Helm
       uses: azure/setup-helm@v3

charts/identity/Chart.yaml

@@ -4,8 +4,8 @@ description: A Helm chart for deploying Unikorn's IdP
 
 type: application
 
-version: v0.2.28
-appVersion: v0.2.28
+version: v0.2.29
+appVersion: v0.2.29
 
 icon: https://raw.githubusercontent.com/unikorn-cloud/assets/main/images/logos/dark-on-light/icon.png
 

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/oapi-codegen/runtime v1.1.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.9.0
-	github.com/unikorn-cloud/core v0.1.62
+	github.com/unikorn-cloud/core v0.1.63
 	go.opentelemetry.io/otel v1.28.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0
 	go.opentelemetry.io/otel/sdk v1.28.0

go.sum

@@ -127,8 +127,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
 github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/unikorn-cloud/core v0.1.62 h1:EbXZxQxBIYjWC/LVLw8xAd46609u5GLc2DxnrZnLYxE=
-github.com/unikorn-cloud/core v0.1.62/go.mod h1:Cd0zU1LrKo+OwnnCwuTQ+QL3yibnkjDHtkujfDM4AdE=
+github.com/unikorn-cloud/core v0.1.63 h1:Jl/xuoGRKESMXhS1+apcaS/1I776agTyT75BGz9AKBA=
+github.com/unikorn-cloud/core v0.1.63/go.mod h1:JcUIQW3+oiZPUQmOlENw3OCi35IBxPKa+J4MbP3TO7k=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=

pkg/handler/groups/client.go

@@ -190,13 +190,15 @@ func (c *Client) Update(ctx context.Context, organizationID, groupID string, req
 		return err
 	}
 
+	if err := conversion.UpdateObjectMetadata(required, current); err != nil {
+		return errors.OAuth2ServerError("failed to merge metadata").WithError(err)
+	}
+
 	updated := current.DeepCopy()
 	updated.Labels = required.Labels
 	updated.Annotations = required.Annotations
 	updated.Spec = required.Spec
 
-	conversion.UpdateObjectMetadata(updated, required)
-
 	if err := c.client.Patch(ctx, updated, client.MergeFrom(current)); err != nil {
 		return errors.OAuth2ServerError("failed to patch group").WithError(err)
 	}

pkg/handler/oauth2providers/client.go

@@ -167,13 +167,15 @@ func (c *Client) Update(ctx context.Context, organizationID, providerID string,
 
 	required := c.generate(ctx, organization, request)
 
+	if err := conversion.UpdateObjectMetadata(required, current); err != nil {
+		return errors.OAuth2ServerError("failed to merge metadata").WithError(err)
+	}
+
 	updated := current.DeepCopy()
 	updated.Labels = required.Labels
 	updated.Annotations = required.Annotations
 	updated.Spec = required.Spec
 
-	conversion.UpdateObjectMetadata(updated, required)
-
 	if err := c.client.Patch(ctx, updated, client.MergeFrom(current)); err != nil {
 		return errors.OAuth2ServerError("failed to patch oauth2 provider").WithError(err)
 	}

pkg/handler/organizations/client.go

@@ -219,13 +219,15 @@ func (c *Client) Update(ctx context.Context, organizationID string, request *ope
 
 	required := c.generate(ctx, request)
 
+	if err := conversion.UpdateObjectMetadata(required, current); err != nil {
+		return errors.OAuth2ServerError("failed to merge metadata").WithError(err)
+	}
+
 	updated := current.DeepCopy()
 	updated.Labels = required.Labels
 	updated.Annotations = required.Annotations
 	updated.Spec = required.Spec
 
-	conversion.UpdateObjectMetadata(updated, required)
-
 	if err := c.client.Patch(ctx, updated, client.MergeFrom(current)); err != nil {
 		return errors.OAuth2ServerError("failed to patch organization").WithError(err)
 	}

pkg/handler/projects/client.go

@@ -186,13 +186,15 @@ func (c *Client) Update(ctx context.Context, organizationID, projectID string, r
 		return err
 	}
 
+	if err := conversion.UpdateObjectMetadata(required, current); err != nil {
+		return errors.OAuth2ServerError("failed to merge metadata").WithError(err)
+	}
+
 	updated := current.DeepCopy()
 	updated.Labels = required.Labels
 	updated.Annotations = required.Annotations
 	updated.Spec = required.Spec
 
-	conversion.UpdateObjectMetadata(updated, required)
-
 	if err := c.client.Patch(ctx, updated, client.MergeFrom(current)); err != nil {
 		return errors.OAuth2ServerError("failed to patch project").WithError(err)
 	}