feat: [AH-1077]: Change secretSpaceId from int to int64 (#3553)

* feat: [AH-1077]: fix tests
* resolve conflicts
* feat: [AH-1077]: Change secretSpaceId from int to int64

app/services/webhook/trigger.go

@@ -376,7 +376,7 @@ func (w *WebhookExecutor) prepareHTTPRequest(
 		secretValue = decryptedSecret
 	} else if webhook.SecretIdentifier != "" {
 		decryptedSecret, err := getSecretValue(ctx, w.spacePathStore, w.secretService,
-			int64(webhook.SecretSpaceID), webhook.SecretIdentifier)
+			webhook.SecretSpaceID, webhook.SecretIdentifier)
 		if err != nil {
 			return nil, fmt.Errorf("failed get secret secret value: %w", err)
 		}

registry/app/api/controller/metadata/interfaces.go

@@ -39,7 +39,7 @@ type RegistryMetadataHelper interface {
 		parentRef string,
 		regRef string,
 	) (*RegistryRequestBaseInfo, error)
-	getSecretSpaceID(ctx context.Context, secretSpacePath *string) (int, error)
+	getSecretSpaceID(ctx context.Context, secretSpacePath *string) (int64, error)
 	MapToAPIWebhookTriggers(triggers []enum.WebhookTrigger) []api.Trigger
 	MapToInternalWebhookTriggers(
 		triggers []api.Trigger,

registry/app/api/controller/metadata/mocks.go

@@ -76,7 +76,7 @@ func (m *MockRegistryMetadataHelper) GetRegistryRequestBaseInfo(
 	return nil, args.Error(1)
 }
 
-func (m *MockRegistryMetadataHelper) getSecretSpaceID(_ context.Context, _ *string) (int, error) {
+func (m *MockRegistryMetadataHelper) getSecretSpaceID(_ context.Context, _ *string) (int64, error) {
 	// TODO implement me
 	panic("implement me")
 }

registry/app/api/controller/metadata/registry_metadata_helper.go

@@ -50,7 +50,7 @@ func NewRegistryMetadataHelper(
 	return &gitnessRegistryMetadataHelper
 }
 
-func (r *GitnessRegistryMetadataHelper) getSecretSpaceID(ctx context.Context, secretSpacePath *string) (int, error) {
+func (r *GitnessRegistryMetadataHelper) getSecretSpaceID(ctx context.Context, secretSpacePath *string) (int64, error) {
 	if secretSpacePath == nil {
 		return -1, fmt.Errorf("secret space path is missing")
 	}
@@ -59,7 +59,7 @@ func (r *GitnessRegistryMetadataHelper) getSecretSpaceID(ctx context.Context, se
 	if err != nil {
 		return -1, fmt.Errorf("failed to get Space Path: %w", err)
 	}
-	return int(path.SpaceID), nil
+	return path.SpaceID, nil
 }
 
 // GetRegistryRequestBaseInfo returns the base info for the registry request
@@ -225,7 +225,7 @@ func (r *GitnessRegistryMetadataHelper) MapToWebhookResponseEntity(
 	}
 	secretSpacePath := ""
 	if createdWebhook.SecretSpaceID > 0 {
-		primary, err := r.spacePathStore.FindPrimaryBySpaceID(ctx, int64(createdWebhook.SecretSpaceID))
+		primary, err := r.spacePathStore.FindPrimaryBySpaceID(ctx, createdWebhook.SecretSpaceID)
 		if err != nil {
 			return nil, fmt.Errorf("failed to get secret space path: %w", err)
 		}

registry/app/api/controller/metadata/registry_metadata_helper_test.go

@@ -217,7 +217,7 @@ func TestMapToWebhook_WithSecretSpacePath(t *testing.T) {
 	assert.Equal(t, false, webhook.Insecure)
 	assert.Len(t, webhook.Triggers, 1)
 	assert.Equal(t, gitnessenum.WebhookTriggerArtifactCreated, webhook.Triggers[0])
-	assert.Equal(t, 2, webhook.SecretSpaceID)
+	assert.Equal(t, int64(2), webhook.SecretSpaceID)
 }
 
 func TestMapToWebhook_WithInexistentSecretSpacePath(t *testing.T) {
@@ -301,7 +301,7 @@ func TestMapToWebhookResponseEntity(t *testing.T) {
 	assert.Equal(t, "value", extraHeaders[0].Value)
 	assert.Equal(t, "secret-id", *webhookResponseEntity.SecretIdentifier)
 	assert.Equal(t, "secret/path", *webhookResponseEntity.SecretSpacePath)
-	assert.Equal(t, 1, *webhookResponseEntity.SecretSpaceId)
+	assert.Equal(t, int64(1), *webhookResponseEntity.SecretSpaceId)
 }
 
 //nolint:lll

registry/app/api/openapi/api.yaml

@@ -1828,6 +1828,7 @@ components:
           type: string
         secretSpaceId:
           type: integer
+          format: int64
         insecure:
           type: boolean
         triggers:
@@ -2305,6 +2306,7 @@ components:
           type: string
         secretSpaceId:
           type: integer
+          format: int64
         triggers:
           type: array
           items:
@@ -2338,6 +2340,7 @@ components:
           type: string
         secretSpaceId:
           type: integer
+          format: int64
       required:
         - userName
     AccessKeySecretKey:
@@ -2350,12 +2353,14 @@ components:
           type: string
         accessKeySecretSpaceId:
           type: integer
+          format: int64
         secretKeyIdentifier:
           type: string
         secretKeySpacePath:
           type: string
         secretKeySpaceId:
           type: integer
+          format: int64
       required:
         - secretKeyIdentifier
     Anonymous: {}

registry/app/api/openapi/contracts/artifact/services.gen.go

@@ -1,6 +1,6 @@
 // Package artifact provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.4.1 DO NOT EDIT.
+// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.1.0 DO NOT EDIT.
 package artifact
 
 import (
@@ -346,6 +346,7 @@ type MiddlewareFunc func(http.Handler) http.Handler
 
 // CreateRegistry operation middleware
 func (siw *ServerInterfaceWrapper) CreateRegistry(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -368,11 +369,12 @@ func (siw *ServerInterfaceWrapper) CreateRegistry(w http.ResponseWriter, r *http
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // DeleteRegistry operation middleware
 func (siw *ServerInterfaceWrapper) DeleteRegistry(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -393,11 +395,12 @@ func (siw *ServerInterfaceWrapper) DeleteRegistry(w http.ResponseWriter, r *http
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetRegistry operation middleware
 func (siw *ServerInterfaceWrapper) GetRegistry(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -418,11 +421,12 @@ func (siw *ServerInterfaceWrapper) GetRegistry(w http.ResponseWriter, r *http.Re
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // ModifyRegistry operation middleware
 func (siw *ServerInterfaceWrapper) ModifyRegistry(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -443,11 +447,12 @@ func (siw *ServerInterfaceWrapper) ModifyRegistry(w http.ResponseWriter, r *http
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // ListArtifactLabels operation middleware
 func (siw *ServerInterfaceWrapper) ListArtifactLabels(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -495,11 +500,12 @@ func (siw *ServerInterfaceWrapper) ListArtifactLabels(w http.ResponseWriter, r *
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetArtifactStatsForRegistry operation middleware
 func (siw *ServerInterfaceWrapper) GetArtifactStatsForRegistry(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -539,11 +545,12 @@ func (siw *ServerInterfaceWrapper) GetArtifactStatsForRegistry(w http.ResponseWr
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // DeleteArtifact operation middleware
 func (siw *ServerInterfaceWrapper) DeleteArtifact(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -573,11 +580,12 @@ func (siw *ServerInterfaceWrapper) DeleteArtifact(w http.ResponseWriter, r *http
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // UpdateArtifactLabels operation middleware
 func (siw *ServerInterfaceWrapper) UpdateArtifactLabels(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -607,11 +615,12 @@ func (siw *ServerInterfaceWrapper) UpdateArtifactLabels(w http.ResponseWriter, r
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetArtifactStats operation middleware
 func (siw *ServerInterfaceWrapper) GetArtifactStats(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -660,11 +669,12 @@ func (siw *ServerInterfaceWrapper) GetArtifactStats(w http.ResponseWriter, r *ht
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetArtifactSummary operation middleware
 func (siw *ServerInterfaceWrapper) GetArtifactSummary(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -694,11 +704,12 @@ func (siw *ServerInterfaceWrapper) GetArtifactSummary(w http.ResponseWriter, r *
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // DeleteArtifactVersion operation middleware
 func (siw *ServerInterfaceWrapper) DeleteArtifactVersion(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -737,11 +748,12 @@ func (siw *ServerInterfaceWrapper) DeleteArtifactVersion(w http.ResponseWriter,
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetArtifactDetails operation middleware
 func (siw *ServerInterfaceWrapper) GetArtifactDetails(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -791,11 +803,12 @@ func (siw *ServerInterfaceWrapper) GetArtifactDetails(w http.ResponseWriter, r *
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetDockerArtifactDetails operation middleware
 func (siw *ServerInterfaceWrapper) GetDockerArtifactDetails(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -852,11 +865,12 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactDetails(w http.ResponseWrite
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetDockerArtifactLayers operation middleware
 func (siw *ServerInterfaceWrapper) GetDockerArtifactLayers(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -913,11 +927,12 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactLayers(w http.ResponseWriter
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetDockerArtifactManifest operation middleware
 func (siw *ServerInterfaceWrapper) GetDockerArtifactManifest(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -974,11 +989,12 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactManifest(w http.ResponseWrit
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetDockerArtifactManifests operation middleware
 func (siw *ServerInterfaceWrapper) GetDockerArtifactManifests(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1017,11 +1033,12 @@ func (siw *ServerInterfaceWrapper) GetDockerArtifactManifests(w http.ResponseWri
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetArtifactFiles operation middleware
 func (siw *ServerInterfaceWrapper) GetArtifactFiles(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1103,11 +1120,12 @@ func (siw *ServerInterfaceWrapper) GetArtifactFiles(w http.ResponseWriter, r *ht
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetHelmArtifactDetails operation middleware
 func (siw *ServerInterfaceWrapper) GetHelmArtifactDetails(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1146,11 +1164,12 @@ func (siw *ServerInterfaceWrapper) GetHelmArtifactDetails(w http.ResponseWriter,
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetHelmArtifactManifest operation middleware
 func (siw *ServerInterfaceWrapper) GetHelmArtifactManifest(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1189,11 +1208,12 @@ func (siw *ServerInterfaceWrapper) GetHelmArtifactManifest(w http.ResponseWriter
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetArtifactVersionSummary operation middleware
 func (siw *ServerInterfaceWrapper) GetArtifactVersionSummary(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1232,11 +1252,12 @@ func (siw *ServerInterfaceWrapper) GetArtifactVersionSummary(w http.ResponseWrit
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetAllArtifactVersions operation middleware
 func (siw *ServerInterfaceWrapper) GetAllArtifactVersions(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1309,11 +1330,12 @@ func (siw *ServerInterfaceWrapper) GetAllArtifactVersions(w http.ResponseWriter,
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetAllArtifactsByRegistry operation middleware
 func (siw *ServerInterfaceWrapper) GetAllArtifactsByRegistry(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1385,11 +1407,12 @@ func (siw *ServerInterfaceWrapper) GetAllArtifactsByRegistry(w http.ResponseWrit
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetClientSetupDetails operation middleware
 func (siw *ServerInterfaceWrapper) GetClientSetupDetails(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1429,11 +1452,12 @@ func (siw *ServerInterfaceWrapper) GetClientSetupDetails(w http.ResponseWriter,
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // ListWebhooks operation middleware
 func (siw *ServerInterfaceWrapper) ListWebhooks(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1497,11 +1521,12 @@ func (siw *ServerInterfaceWrapper) ListWebhooks(w http.ResponseWriter, r *http.R
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // CreateWebhook operation middleware
 func (siw *ServerInterfaceWrapper) CreateWebhook(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1522,11 +1547,12 @@ func (siw *ServerInterfaceWrapper) CreateWebhook(w http.ResponseWriter, r *http.
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // DeleteWebhook operation middleware
 func (siw *ServerInterfaceWrapper) DeleteWebhook(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1556,11 +1582,12 @@ func (siw *ServerInterfaceWrapper) DeleteWebhook(w http.ResponseWriter, r *http.
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetWebhook operation middleware
 func (siw *ServerInterfaceWrapper) GetWebhook(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1590,11 +1617,12 @@ func (siw *ServerInterfaceWrapper) GetWebhook(w http.ResponseWriter, r *http.Req
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // UpdateWebhook operation middleware
 func (siw *ServerInterfaceWrapper) UpdateWebhook(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1624,11 +1652,12 @@ func (siw *ServerInterfaceWrapper) UpdateWebhook(w http.ResponseWriter, r *http.
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // ListWebhookExecutions operation middleware
 func (siw *ServerInterfaceWrapper) ListWebhookExecutions(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1677,11 +1706,12 @@ func (siw *ServerInterfaceWrapper) ListWebhookExecutions(w http.ResponseWriter,
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetWebhookExecution operation middleware
 func (siw *ServerInterfaceWrapper) GetWebhookExecution(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1720,11 +1750,12 @@ func (siw *ServerInterfaceWrapper) GetWebhookExecution(w http.ResponseWriter, r
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // ReTriggerWebhookExecution operation middleware
 func (siw *ServerInterfaceWrapper) ReTriggerWebhookExecution(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1763,11 +1794,12 @@ func (siw *ServerInterfaceWrapper) ReTriggerWebhookExecution(w http.ResponseWrit
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetArtifactStatsForSpace operation middleware
 func (siw *ServerInterfaceWrapper) GetArtifactStatsForSpace(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1807,11 +1839,12 @@ func (siw *ServerInterfaceWrapper) GetArtifactStatsForSpace(w http.ResponseWrite
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetAllArtifacts operation middleware
 func (siw *ServerInterfaceWrapper) GetAllArtifacts(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1899,11 +1932,12 @@ func (siw *ServerInterfaceWrapper) GetAllArtifacts(w http.ResponseWriter, r *htt
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 // GetAllRegistries operation middleware
 func (siw *ServerInterfaceWrapper) GetAllRegistries(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
 
 	var err error
 
@@ -1991,7 +2025,7 @@ func (siw *ServerInterfaceWrapper) GetAllRegistries(w http.ResponseWriter, r *ht
 		handler = middleware(handler)
 	}
 
-	handler.ServeHTTP(w, r)
+	handler.ServeHTTP(w, r.WithContext(ctx))
 }
 
 type UnescapedCookieParamError struct {
@@ -5759,72 +5793,72 @@ var swaggerSpec = []string{
 	"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",
-	"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",
+	"BV3t9ghIr3s9qDo5v0g+JDtOVN7VS3FBALsSZ/L0J1zfQh9B8idc1wcPZBmtxyEot6D4L1uUvk2BDydM",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"vPcqyoOro2BItMInvn7Qq5YgeY6jBAT5CbWFXK6SgBmChg65b5nmgzrnLXp7WoYHFkfPtSafCgf0Zr0Q",
-	"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",
+	"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",
-	"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",
+	"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",
-	"6LGowm6vbkmClPshi2pZ2qmfTRObxDWyBaNEyW4KditJKvSRrslt5KxFK28rTA161FZRCmhbaCsZDWTW",
+	"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",
-	"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",
+	"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",
-	"FhFpMtrzK4ZoCjB+TlDgerpNpboNqgeCeu4ogiDO0mkShb6G/+Kzw7+zfW5Nhc7yOK3adMCfaYjgJVhj",
+	"ImZNxoN+xRBNAcbPCQpcT7ftVLdB9VBRzx1FEMRZOk2i0NfwX3x2+He2E66p0FkeyVWbDvgzDRG8BGus",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"e9RYoqbBHUMXoWKhYvIIEqOm+iYLdGytk+aq3s72Cuz1K7DcMb6L7mq4uusBcOxI6SJD5vZzaqUWJHTM",
-	"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",
+	"+qCCRoWyNjieoP1WJa1Xg7+RGswjtyxEppCUIsaqV4OnpgafLWZUP5NW2kCJL2nUeXm7bchTgiq3w6AS",
-	"SEeNQ41N462NduFMKcyo148nrR+VSdbB1Byc0HTktKK12s+cZIGJ/sxugZIsndgeR03LZ4fVsKs5RNgh",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"k6Xde5EGk5KfQolTDAk5ZbLvzaLEJybflrRJ1ae7u6kULUfWq4rYYxLonb2XBdbtlXYz5UVCtY6ki4p7",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"nwPsEnDw2pbgt7r2VVczyaTS8mVY4vTJLMN4nsjcnMIBSzwBaj7XfecE8AlGFF5Y9HHhLglJ8cVg8Pz8",
-	"+WzJq56FCRtaSKLmBofTiRL1cOH+cXZ+ds5OxlMYgzR0L9x/sp/4eSbj6wAp95Rpolt2R+IhybyjM5c1",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"3CsI6+jZYkkcyHv6QXGJqNV31yEm1VC3uq1VC6DDe0Kk11ovBQv4mflO2pZmN+kWZTEEyF/eQbStajU/",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"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",
-	"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",
+	"0XQvxSxqgGKjIAe/xF8PRc4kuzwwRdc6n/L9wqtd7eTZw+QgegfxAzmIN0KwJTlMm6r6CMmrB9LbVVGl",
-	"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",
+	"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",
-	"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",
+	"UALMC+G9+J7/9hAGm+3FoGFlL+X8fQX4f66QPQn2ZCG8ZXzr4XBYdA/y1MZNOOcltBmrywifQZHatsd5",
-	"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",
+	"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",
-	"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",
+	"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",
-	"Epq68LKnOWgDXIyqW5bca4Q/UjEAaTh4+oPNn2ir9nL4dMKf2WR3TJ6TsVM2z4koMUglRryToRBIgaRv",
+	"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",
-	"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",
+	"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",
-	"knNw4uTjAAA=",
+	"BTFjuznkAAA=",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file

registry/app/api/openapi/contracts/artifact/types.gen.go

@@ -1,6 +1,6 @@
 // Package artifact provides primitives to interact with the openapi HTTP API.
 //
-// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.4.1 DO NOT EDIT.
+// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.1.0 DO NOT EDIT.
 package artifact
 
 import (
@@ -91,10 +91,10 @@ const (
 type AccessKeySecretKey struct {
 	AccessKey                 *string `json:"accessKey,omitempty"`
 	AccessKeySecretIdentifier *string `json:"accessKeySecretIdentifier,omitempty"`
-	AccessKeySecretSpaceId    *int    `json:"accessKeySecretSpaceId,omitempty"`
+	AccessKeySecretSpaceId    *int64  `json:"accessKeySecretSpaceId,omitempty"`
 	AccessKeySecretSpacePath  *string `json:"accessKeySecretSpacePath,omitempty"`
 	SecretKeyIdentifier       string  `json:"secretKeyIdentifier"`
-	SecretKeySpaceId          *int    `json:"secretKeySpaceId,omitempty"`
+	SecretKeySpaceId          *int64  `json:"secretKeySpaceId,omitempty"`
 	SecretKeySpacePath        *string `json:"secretKeySpacePath,omitempty"`
 }
 
@@ -604,7 +604,7 @@ type UpstreamConfigSource string
 // UserPassword defines model for UserPassword.
 type UserPassword struct {
 	SecretIdentifier *string `json:"secretIdentifier,omitempty"`
-	SecretSpaceId    *int    `json:"secretSpaceId,omitempty"`
+	SecretSpaceId    *int64  `json:"secretSpaceId,omitempty"`
 	SecretSpacePath  *string `json:"secretSpacePath,omitempty"`
 	UserName         string  `json:"userName"`
 }
@@ -630,7 +630,7 @@ type Webhook struct {
 	ModifiedAt            *string            `json:"modifiedAt,omitempty"`
 	Name                  string             `json:"name"`
 	SecretIdentifier      *string            `json:"secretIdentifier,omitempty"`
-	SecretSpaceId         *int               `json:"secretSpaceId,omitempty"`
+	SecretSpaceId         *int64             `json:"secretSpaceId,omitempty"`
 	SecretSpacePath       *string            `json:"secretSpacePath,omitempty"`
 	Triggers              *[]Trigger         `json:"triggers,omitempty"`
 	Url                   string             `json:"url"`
@@ -687,7 +687,7 @@ type WebhookRequest struct {
 	Insecure         bool           `json:"insecure"`
 	Name             string         `json:"name"`
 	SecretIdentifier *string        `json:"secretIdentifier,omitempty"`
-	SecretSpaceId    *int           `json:"secretSpaceId,omitempty"`
+	SecretSpaceId    *int64         `json:"secretSpaceId,omitempty"`
 	SecretSpacePath  *string        `json:"secretSpacePath,omitempty"`
 	Triggers         *[]Trigger     `json:"triggers,omitempty"`
 	Url              string         `json:"url"`

registry/app/store/database/util/utils.go

@@ -29,11 +29,11 @@ func GetEmptySQLString(str string) sql.NullString {
 	return sql.NullString{String: str, Valid: true}
 }
 
-func GetEmptySQLInt64(i int) sql.NullInt64 {
+func GetEmptySQLInt64(i int64) sql.NullInt64 {
 	if i == 0 {
-		return sql.NullInt64{Int64: int64(i), Valid: false}
+		return sql.NullInt64{Int64: i, Valid: false}
 	}
-	return sql.NullInt64{Int64: int64(i), Valid: true}
+	return sql.NullInt64{Int64: i, Valid: true}
 }
 
 func ConstructQuery(query string, args []interface{}) string {

registry/app/store/database/webhook.go

@@ -456,7 +456,7 @@ func mapToWebhook(webhookDB *webhookDB) (*gitnesstypes.WebhookCore, error) {
 		webhook.SecretIdentifier = webhookDB.SecretIdentifier.String
 	}
 	if webhookDB.SecretSpaceID.Valid {
-		webhook.SecretSpaceID = int(webhookDB.SecretSpaceID.Int64)
+		webhook.SecretSpaceID = webhookDB.SecretSpaceID.Int64
 	}
 
 	if webhookDB.Internal {

registry/types/upstream_proxy_config.go

@@ -29,10 +29,10 @@ type UpstreamProxyConfig struct {
 	AuthType                 string
 	UserName                 string
 	UserNameSecretIdentifier string
-	UserNameSecretSpaceID    int
+	UserNameSecretSpaceID    int64
 	Password                 string
 	SecretIdentifier         string
-	SecretSpaceID            int
+	SecretSpaceID            int64
 	Token                    string
 	CreatedAt                time.Time
 	UpdatedAt                time.Time

types/webhook.go

@@ -175,7 +175,7 @@ type WebhookCore struct {
 	Triggers              []enum.WebhookTrigger
 	LatestExecutionResult *enum.WebhookExecutionResult
 	SecretIdentifier      string
-	SecretSpaceID         int
+	SecretSpaceID         int64
 	ExtraHeaders          []ExtraHeader
 }