OCM-12922 | fix: Fixing manual-mode + log event output

openshift · Dec 4, 2024 · 270b606 · 270b606
1 parent d26a65a
commit 270b606
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/cmd/create/network/cmd.go b/cmd/create/network/cmd.go
@@ -134,31 +134,31 @@ func NetworkRunner(userOptions *opts.NetworkUserOptions) rosa.CommandRunner {
 		if err != nil {
 			return err
 		}
-
 		service := helper.NewNetworkService()
 
 		mode, err := interactive.GetMode()
 		if err != nil {
 			return err
 		}
 
+		defaultTemplateUsed := templateCommand == defaultTemplate
 		switch mode {
 		case interactive.ModeManual:
-			r.Reporter.Infof(helper.ManualModeHelperMessage(parsedParams, templateFile, parsedTags))
+			r.Reporter.Infof(helper.ManualModeHelperMessage(parsedParams, parsedTags))
 			r.OCMClient.LogEvent("ROSANetworkStackManual",
 				map[string]string{
-					ocm.Account:      r.Creator.AccountID,
-					ocm.Organization: orgID,
-					"template":       templateFile,
+					ocm.Account:        r.Creator.AccountID,
+					ocm.Organization:   orgID,
+					"default-template": fmt.Sprintf("%t", defaultTemplateUsed),
 				},
 			)
 			return nil
 		default:
 			r.OCMClient.LogEvent("ROSANetworkStack",
 				map[string]string{
-					ocm.Account:      r.Creator.AccountID,
-					ocm.Organization: orgID,
-					"template":       templateFile,
+					ocm.Account:        r.Creator.AccountID,
+					ocm.Organization:   orgID,
+					"default-template": fmt.Sprintf("%t", defaultTemplateUsed),
 				},
 			)
 			return service.CreateStack(&templateFile, &templateBody, parsedParams, parsedTags)

diff --git a/pkg/network/helper.go b/pkg/network/helper.go
@@ -142,9 +142,9 @@ func deleteHelperMessage(logger *logrus.Logger, params map[string]string, err er
 		params["Name"], params["Region"])
 }
 
-func ManualModeHelperMessage(params map[string]string,
-	templateFile string, tags map[string]string) string {
+func ManualModeHelperMessage(params map[string]string, tags map[string]string) string {
 	return fmt.Sprintf("Run the following command to create the stack manually:\n"+
-		"aws cloudformation create-stack --stack-name %s --template-body file://%s --param %s --tags %s --region %s",
-		params["Name"], templateFile, formatParams(params), formatTags(tags), params["Region"])
+		"aws cloudformation create-stack --stack-name %s --template-body file://<template-file-path>"+
+		" --param %s --tags %s --region %s",
+		params["Name"], formatParams(params), formatTags(tags), params["Region"])
 }
diff --git a/pkg/network/helper_test.go b/pkg/network/helper_test.go
@@ -118,16 +118,15 @@ var _ = Describe("Helper Functions", func() {
 				"Name":   "test-stack",
 				"Region": "us-west-1",
 			}
-			templateFile := "test-template.yaml"
 			tags := map[string]string{
 				"TagKey1": "TagValue1",
 				"TagKey2": "TagValue2",
 			}
 			expectedMessage := "Run the following command to create the stack manually:\n" +
-				"aws cloudformation create-stack --stack-name test-stack --template-body file://test-template.yaml " +
+				"aws cloudformation create-stack --stack-name test-stack --template-body file://<template-file-path> " +
 				"--param ParameterKey=Name,ParameterValue=test-stack ParameterKey=Region,ParameterValue=us-west-1 " +
 				" --tags Key=TagKey1,Value=TagValue1 Key=TagKey2,Value=TagValue2  --region us-west-1"
-			Expect(ManualModeHelperMessage(params, templateFile, tags)).To(Equal(expectedMessage))
+			Expect(ManualModeHelperMessage(params, tags)).To(Equal(expectedMessage))
 		})
 	})
 

diff --git a/pkg/network/network.go b/pkg/network/network.go
@@ -101,7 +101,7 @@ func (s *network) CreateStack(templateFile *string, templateBody *[]byte,
 	})
 	if err != nil {
 		deleteHelperMessage(logger, params, err)
-		helperMsg := ManualModeHelperMessage(params, template, tags)
+		helperMsg := ManualModeHelperMessage(params, tags)
 		logger.Infof(helperMsg)
 		return fmt.Errorf("failed to wait for stack creation, %v", err)
 	}