fix: [ASSMT-435]: support for all parameters in config file (#122)

Co-authored-by: Edgar Garcia <[email protected]>
harness · Jun 13, 2024 · b5f0f10 · b5f0f10
1 parent 7eff8f6
commit b5f0f10
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/main.go b/main.go
@@ -68,7 +68,6 @@ var migrationReq = struct {
 	Cert                  string `survey:"cert"`
 	Key                   string `survey:"key"`
 	Auth64                string `survey:"auth64"`
-	Insecure              bool   `survey:"insecure"`
 }{}
 
 func getReqBody(entityType EntityType, filter Filter) RequestBody {
@@ -150,7 +149,7 @@ func logSpinnakerMigrationDetails(authMethod string) {
 		migrationReq.SpinnakerAppName,
 		migrationReq.PipelineName,
 		authMethod,
-		migrationReq.Insecure,
+		migrationReq.AllowInsecureReq,
 	)
 
 	// Log the formatted message
@@ -362,6 +361,16 @@ func main() {
 			Usage:       "Specifies Spinnaker Application from which pipelines to be migrated.",
 			Destination: &migrationReq.SpinnakerAppName,
 		}),
+		altsrc.NewStringFlag(&cli.StringFlag{
+			Name:        "cert",
+			Usage:       "x509 cert location for authenticating with spinnaker",
+			Destination: &migrationReq.Cert,
+		}),
+		altsrc.NewStringFlag(&cli.StringFlag{
+			Name:        "key",
+			Usage:       "x509 key location for authenticating with spinnaker",
+			Destination: &migrationReq.Key,
+		}),
 	}
 	app := &cli.App{
 		Name:                 "harness-upgrade",
@@ -595,7 +604,7 @@ func main() {
 					&cli.BoolFlag{
 						Name:        "insecure",
 						Usage:       "Weteher to validate the TLS certificate or not",
-						Destination: &migrationReq.Insecure,
+						Destination: &migrationReq.AllowInsecureReq,
 					},
 					&cli.StringFlag{
 						Name:        "key",

diff --git a/pipelines.go b/pipelines.go
@@ -152,7 +152,7 @@ func addDependentPipelineRecursive(pipelines []map[string]interface{}, pipelineS
 
 	i, p, err := findPipelineIndexById(pipelines, pipelineId)
 
-	if err == nil {
+	if true {
 
 		if p == nil {
 			var appName = pipelineStage["application"].(string)
@@ -331,7 +331,7 @@ func findPipelineIdByName(pipelines []PipelineDetails, name string) string {
 }
 
 func getAllPipelines(authMethod string, appName string) ([]byte, error) {
-	return GetWithAuth(migrationReq.SpinnakerHost, "applications/"+appName+"/pipelineConfigs", authMethod, migrationReq.Auth64, migrationReq.Cert, migrationReq.Key, migrationReq.Insecure)
+	return GetWithAuth(migrationReq.SpinnakerHost, "applications/"+appName+"/pipelineConfigs", authMethod, migrationReq.Auth64, migrationReq.Cert, migrationReq.Key, migrationReq.AllowInsecureReq)
 }
 
 // this is because there's no endpoint in gate to fetch pipeline config based on a pipeline id
@@ -369,7 +369,7 @@ func findPipelineIndexById(pipelines []map[string]interface{}, pipelineId string
 }
 
 func getSinglePipeline(authMethod string, name string) ([]byte, error) {
-	return GetWithAuth(migrationReq.SpinnakerHost, "applications/"+migrationReq.SpinnakerAppName+"/pipelineConfigs/"+name, authMethod, migrationReq.Auth64, migrationReq.Cert, migrationReq.Key, migrationReq.Insecure)
+	return GetWithAuth(migrationReq.SpinnakerHost, "applications/"+migrationReq.SpinnakerAppName+"/pipelineConfigs/"+name, authMethod, migrationReq.Auth64, migrationReq.Cert, migrationReq.Key, migrationReq.AllowInsecureReq)
 }
 
 func createSpinnakerPipelines(pipelines interface{}) (reqId string, err error) {