Merge pull request #197 from massdriver-cloud/chris/self-hosted/massdriver-url-in-state-gen

Use MASSDRIVER_URL for HTTP state backend

Author: chrisghill

src/provisioners/terraform/backend.go

@@ -85,7 +85,7 @@ func GenerateJSONBackendHTTPConfig(spec *massdriver.Specification, bundleStep st
 
 	httpbb.Username = spec.DeploymentID
 	httpbb.Password = spec.Token
-	httpbb.Address = fmt.Sprintf("https://api.massdriver.cloud/state/%s/%s", getPackageNameShort(spec.PackageName), bundleStep)
+	httpbb.Address = fmt.Sprintf("%s/state/%s/%s", spec.URL, getPackageNameShort(spec.PackageName), bundleStep)
 	httpbb.LockAddress = httpbb.Address
 	httpbb.UnlockAddress = httpbb.Address
 

src/provisioners/terraform/backend_test.go

@@ -12,6 +12,7 @@ func TestGenerateJSONBackendHTTPConfig(t *testing.T) {
 		DeploymentID: "depId",
 		Token:        "token",
 		PackageName:  "pkg-id-long-0000",
+		URL:          "https://foo.massdriver.cloud",
 	}
 	got, _ := GenerateJSONBackendHTTPConfig(&spec, "step")
 	want := `
@@ -21,9 +22,9 @@ func TestGenerateJSONBackendHTTPConfig(t *testing.T) {
 				"http": {
 					"username": "depId",
 					"password": "token",
-					"address": "https://api.massdriver.cloud/state/pkg-id-long/step",
-					"lock_address": "https://api.massdriver.cloud/state/pkg-id-long/step",
-					"unlock_address": "https://api.massdriver.cloud/state/pkg-id-long/step"
+					"address": "https://foo.massdriver.cloud/state/pkg-id-long/step",
+					"lock_address": "https://foo.massdriver.cloud/state/pkg-id-long/step",
+					"unlock_address": "https://foo.massdriver.cloud/state/pkg-id-long/step"
 				}
 			}
 		}