diff --git a/main_test.go b/main_test.go index dbee5bf..cba1f38 100644 --- a/main_test.go +++ b/main_test.go @@ -25,6 +25,9 @@ const elasticCacheTfPath = "elastic-cache-tf" const dynamoDbTfPath = "dynamo-db-tf" const documentDbTfPath = "document-db-tf" +const environment = "dev" +const manifestName = "foo" + var manifestFiles = [3]string{"sample_infra_manifest", "sample_infra_manifest_2", "sample_infra_manifest_flink"} func textDiff(text1, text2 string) string { @@ -178,11 +181,10 @@ func TestTemplates_AuroraDb_CompareWithOutput(t *testing.T) { func Test_getDeploymentPortalUrl(t *testing.T) { testCases := []struct { - name string - manifestFile string - vertical string - expectedURL string - setEnv bool + name string + vertical string + expectedURL string + setEnv bool }{ { name: "Correct Lending Vertical URL should be generated", @@ -223,13 +225,7 @@ func Test_getDeploymentPortalUrl(t *testing.T) { defer func() { _ = os.Unsetenv("TESTING_ENV") }() - testActions, err := setActions(true, false, false) - assert.NoError(t, err) - manifestFile := "sample_infra_manifest.json" - manifest, err := parseManifest(filepath.Join(testDataDir, manifestFile), testActions) - assert.NoError(t, err) - manifest.InfraVertical = testCase.vertical - actualURL := getDeploymentPortalUrl(manifest) + actualURL := getDeploymentPortalUrl(testCase.vertical, environment, manifestName) assert.Equal(t, testCase.expectedURL, actualURL) }) } diff --git a/resource.go b/resource.go index 75f37f2..799f858 100644 --- a/resource.go +++ b/resource.go @@ -32,11 +32,11 @@ func getDeploymentPortalHostUrl(vertical string) string { return fmt.Sprintf("https://%s%s", getInfraVertical(vertical), deploymentPortalUrl) } -func getDeploymentPortalUrl(manifest *Manifest) string { +func getDeploymentPortalUrl(infraVertical string, environment string, name string) string { return fmt.Sprintf("%s/api/manifest/status/env/%s/name/%s", - getDeploymentPortalHostUrl(manifest.InfraVertical), - manifest.Environment, - manifest.Name) + getDeploymentPortalHostUrl(infraVertical), + environment, + name) } var extraResourcesDeploymentStatus ExtraResourcesDeployment @@ -116,7 +116,7 @@ func handlePanic() { func sendResourceDeploymentStatus(manifest *Manifest) { defer handlePanic() client := &http.Client{} - url := getDeploymentPortalUrl(manifest) + url := getDeploymentPortalUrl(manifest.InfraVertical, manifest.Environment, manifest.Name) jsonData, err := json.Marshal(extraResourcesDeploymentStatus) if err != nil { log.Panicf("Error encoding JSON:#{err}")