Pass all template data to getRendezvousHostEnv()

This way arguments can't get mixed up.

Author: zaneb

pkg/asset/agent/image/ignition.go

@@ -306,7 +306,7 @@ func (a *Ignition) Generate(ctx context.Context, dependencies asset.Parents) err
 
 	rendezvousHostFile := ignition.FileFromString(rendezvousHostEnvPath,
 		"root", 0644,
-		getRendezvousHostEnv(agentTemplateData.ServiceProtocol, a.RendezvousIP, authConfig.AgentAuthToken, authConfig.UserAuthToken, agentWorkflow.Workflow))
+		getRendezvousHostEnv(agentTemplateData, a.RendezvousIP, agentWorkflow.Workflow))
 	config.Storage.Files = append(config.Storage.Files, rendezvousHostFile)
 
 	err = addBootstrapScripts(&config, agentManifests.ClusterImageSet.Spec.ReleaseImage)
@@ -448,11 +448,11 @@ func getTemplateData(name, pullSecret, releaseImageList, releaseImage, releaseIm
 	}
 }
 
-func getRendezvousHostEnvTemplate(serviceProtocol, agentAuthtoken, userAuthToken string, workflowType workflow.AgentWorkflowType) string {
+func getRendezvousHostEnvTemplate(data *agentTemplateData, workflowType workflow.AgentWorkflowType) string {
 	host := "{{ if $isIPv6 }}{{ printf \"[%s]\" .RendezvousIP }}{{ else }}{{ .RendezvousIP }}{{ end }}"
-	serviceBaseURL := fmt.Sprintf("%s://%s:8090/", serviceProtocol, host)
-	imageServiceBaseURL := fmt.Sprintf("%s://%s:8888/", serviceProtocol, host)
-	uiBaseURL := fmt.Sprintf("%s://%s:3001/", serviceProtocol, host)
+	serviceBaseURL := fmt.Sprintf("%s://%s:8090/", data.ServiceProtocol, host)
+	imageServiceBaseURL := fmt.Sprintf("%s://%s:8888/", data.ServiceProtocol, host)
+	uiBaseURL := fmt.Sprintf("%s://%s:3001/", data.ServiceProtocol, host)
 
 	// USER_AUTH_TOKEN is required to authenticate API requests against agent-installer-local auth type
 	// and for the endpoints marked with userAuth security definition in assisted-service swagger.yaml.
@@ -475,7 +475,7 @@ USER_AUTH_TOKEN=%s
 WORKFLOW_TYPE=%s
 AIUI_APP_API_URL=%s
 AIUI_URL=%s
-`, serviceBaseURL, imageServiceBaseURL, agentAuthtoken, userAuthToken, workflowType, serviceBaseURL, uiBaseURL)
+`, serviceBaseURL, imageServiceBaseURL, data.AgentAuthToken, data.UserAuthToken, workflowType, serviceBaseURL, uiBaseURL)
 
 	return rendezvousHostEnvTemplate
 }
@@ -492,9 +492,9 @@ func getRendezvousHostEnvFromTemplate(hostEnvTemplate, nodeZeroIP string) (strin
 	return buf.String(), nil
 }
 
-func getRendezvousHostEnv(serviceProtocol, nodeZeroIP, agentAuthtoken, userAuthToken string, workflowType workflow.AgentWorkflowType) string {
+func getRendezvousHostEnv(data *agentTemplateData, nodeZeroIP string, workflowType workflow.AgentWorkflowType) string {
 	env, err := getRendezvousHostEnvFromTemplate(
-		getRendezvousHostEnvTemplate(serviceProtocol, agentAuthtoken, userAuthToken, workflowType),
+		getRendezvousHostEnvTemplate(data, workflowType),
 		nodeZeroIP)
 	if err != nil {
 		panic(err)

pkg/asset/agent/image/ignition_test.go

@@ -124,7 +124,11 @@ func TestIgnition_getRendezvousHostEnv(t *testing.T) {
 	nodeZeroIP := "2001:db8::dead:beef"
 	agentAuthtoken := "agentAuthtoken"
 	userAuthToken := "userAuthToken"
-	rendezvousHostEnv := getRendezvousHostEnv("http", nodeZeroIP, agentAuthtoken, userAuthToken, workflow.AgentWorkflowTypeInstall)
+	rendezvousHostEnv := getRendezvousHostEnv(&agentTemplateData{
+		ServiceProtocol: "http",
+		AgentAuthToken:  agentAuthtoken,
+		UserAuthToken:   userAuthToken,
+	}, nodeZeroIP, workflow.AgentWorkflowTypeInstall)
 	assert.Equal(t,
 		"#\nNODE_ZERO_IP="+nodeZeroIP+"\nSERVICE_BASE_URL=http://["+nodeZeroIP+"]:8090/\nIMAGE_SERVICE_BASE_URL=http://["+nodeZeroIP+"]:8888/\nPULL_SECRET_TOKEN="+agentAuthtoken+"\nUSER_AUTH_TOKEN="+userAuthToken+"\nWORKFLOW_TYPE=install\nAIUI_APP_API_URL=http://["+nodeZeroIP+"]:8090/\nAIUI_URL=http://["+nodeZeroIP+"]:3001/\n",
 		rendezvousHostEnv)

pkg/asset/agent/image/unconfigured_ignition.go

@@ -151,6 +151,7 @@ func (a *UnconfiguredIgnition) Generate(_ context.Context, dependencies asset.Pa
 	a.CPUArch = *osImage.CPUArchitecture
 
 	agentTemplateData := &agentTemplateData{
+		ServiceProtocol:           "http",
 		PullSecret:                pullSecretAsset.GetPullSecretData(),
 		ReleaseImages:             releaseImageList,
 		ReleaseImage:              clusterImageSet.Spec.ReleaseImage,
@@ -164,7 +165,7 @@ func (a *UnconfiguredIgnition) Generate(_ context.Context, dependencies asset.Pa
 
 	enabledServices := getDefaultEnabledServices()
 
-	rendezvousHostTemplateData := getRendezvousHostEnvTemplate("http", "", "", agentWorkflow.Workflow)
+	rendezvousHostTemplateData := getRendezvousHostEnvTemplate(agentTemplateData, agentWorkflow.Workflow)
 	rendezvousHostTemplateFile := ignition.FileFromString(fmt.Sprintf("%s.template", rendezvousHostEnvPath), "root", 0644, rendezvousHostTemplateData)
 	config.Storage.Files = append(config.Storage.Files, rendezvousHostTemplateFile)