Răsfoiți Sursa

update onboarding struct

Alexander Belanger 4 ani în urmă
părinte
comite
6c051cb70b

+ 3 - 0
api/server/handlers/project/update_onboarding.go

@@ -56,8 +56,11 @@ func (p *OnboardingUpdateHandler) ServeHTTP(w http.ResponseWriter, r *http.Reque
 	onboarding.SkipRegistryConnection = request.SkipRegistryConnection
 	onboarding.SkipResourceProvision = request.SkipResourceProvision
 	onboarding.RegistryConnectionID = request.RegistryConnectionID
+	onboarding.RegistryConnectionCredentialID = request.RegistryConnectionCredentialID
 	onboarding.RegistryInfraID = request.RegistryInfraID
+	onboarding.RegistryInfraCredentialID = request.RegistryInfraCredentialID
 	onboarding.ClusterInfraID = request.ClusterInfraID
+	onboarding.ClusterInfraCredentialID = request.ClusterInfraCredentialID
 
 	if isNotFound {
 		// if not found, create onboarding struct

+ 10 - 7
api/types/project.go

@@ -85,13 +85,16 @@ const (
 )
 
 type OnboardingData struct {
-	CurrentStep            StepEnum            `json:"current_step"`
-	ConnectedSource        ConnectedSourceType `json:"connected_source"`
-	SkipRegistryConnection bool                `json:"skip_registry_connection"`
-	SkipResourceProvision  bool                `json:"skip_resource_provision"`
-	RegistryConnectionID   uint                `json:"registry_connection_id"`
-	RegistryInfraID        uint                `json:"registry_infra_id"`
-	ClusterInfraID         uint                `json:"cluster_infra_id"`
+	CurrentStep                    StepEnum            `json:"current_step"`
+	ConnectedSource                ConnectedSourceType `json:"connected_source"`
+	SkipRegistryConnection         bool                `json:"skip_registry_connection"`
+	SkipResourceProvision          bool                `json:"skip_resource_provision"`
+	RegistryConnectionID           uint                `json:"registry_connection_id"`
+	RegistryConnectionCredentialID uint                `json:"registry_connection_credential_id"`
+	RegistryInfraID                uint                `json:"registry_infra_id"`
+	RegistryInfraCredentialID      uint                `json:"registry_infra_credential_id"`
+	ClusterInfraID                 uint                `json:"cluster_infra_id"`
+	ClusterInfraCredentialID       uint                `json:"cluster_infra_credential_id"`
 }
 
 type UpdateOnboardingRequest OnboardingData

+ 21 - 15
internal/models/onboarding.go

@@ -9,25 +9,31 @@ import (
 type Onboarding struct {
 	gorm.Model
 
-	ProjectID              uint
-	CurrentStep            types.StepEnum
-	ConnectedSource        types.ConnectedSourceType
-	SkipRegistryConnection bool
-	SkipResourceProvision  bool
-	RegistryConnectionID   uint
-	RegistryInfraID        uint
-	ClusterInfraID         uint
+	ProjectID                      uint
+	CurrentStep                    types.StepEnum
+	ConnectedSource                types.ConnectedSourceType
+	SkipRegistryConnection         bool
+	SkipResourceProvision          bool
+	RegistryConnectionID           uint
+	RegistryConnectionCredentialID uint
+	RegistryInfraID                uint
+	RegistryInfraCredentialID      uint
+	ClusterInfraID                 uint
+	ClusterInfraCredentialID       uint
 }
 
 // ToOnboardingType generates an external types.OnboardingData to be shared over REST
 func (o *Onboarding) ToOnboardingType() *types.OnboardingData {
 	return &types.OnboardingData{
-		CurrentStep:            o.CurrentStep,
-		ConnectedSource:        o.ConnectedSource,
-		SkipRegistryConnection: o.SkipRegistryConnection,
-		SkipResourceProvision:  o.SkipResourceProvision,
-		RegistryConnectionID:   o.RegistryConnectionID,
-		RegistryInfraID:        o.RegistryInfraID,
-		ClusterInfraID:         o.ClusterInfraID,
+		CurrentStep:                    o.CurrentStep,
+		ConnectedSource:                o.ConnectedSource,
+		SkipRegistryConnection:         o.SkipRegistryConnection,
+		SkipResourceProvision:          o.SkipResourceProvision,
+		RegistryConnectionID:           o.RegistryConnectionID,
+		RegistryConnectionCredentialID: o.RegistryConnectionCredentialID,
+		RegistryInfraID:                o.RegistryInfraID,
+		RegistryInfraCredentialID:      o.RegistryInfraCredentialID,
+		ClusterInfraID:                 o.ClusterInfraID,
+		ClusterInfraCredentialID:       o.ClusterInfraCredentialID,
 	}
 }