Merge pull request #743 from dexhorthy/installation_ctx_replicated_app

Add Customer and installation ID to template context for replicated.app

integration/init_app/basic/expected/.ship/release.yml

@@ -12,6 +12,8 @@ assets:
         contents: |
           #!/bin/bash
           echo "tested nothing"
+          echo "customer {{repl Installation "customer_id" }}"
+          echo "install {{repl Installation "installation_id" }}"
         dest: ./scripts/test.sh
         mode: 0777
 config:

integration/init_app/basic/expected/.ship/state.json

@@ -2,13 +2,13 @@
   "v1": {
     "config": {},
     "upstream": "__upstream__",
-    "contentSHA": "2260e2110304496fc8544b8bf51c95352cdf9300270fe7c7fa9f6e1b76855d1c",
+    "contentSHA": "6faeec976f37e880c5e70cf578412a57fbfda3b35bf8e6f73221fe5fe88f1058",
     "metadata": {
       "applicationType": "replicated.app",
       "customerID": "__customerID__",
       "installationID": "__installationID__",
       "releaseNotes": "integration tests",
-      "version": "1.0.0-SNAPSHOT"
+      "version": "1.0.2"
     },
     "releaseName": "integration-replicated-app-basic"
   }

integration/init_app/basic/expected/installer/scripts/test.sh

@@ -1,2 +1,4 @@
 #!/bin/bash
 echo "tested nothing"
+echo "customer -Am-_6i5pw0u4AbspOwKN4lZUCn49u_G"
+echo "install 3Z6uuPbVz6jTxRuXHn_l6UlYQz3hWz6-"

integration/init_app/basic/input/.ship/release.yml

@@ -12,6 +12,8 @@ assets:
         contents: |
           #!/bin/bash
           echo "tested nothing"
+          echo "customer {{repl Installation "customer_id" }}"
+          echo "install {{repl Installation "installation_id" }}"
         dest: ./scripts/test.sh
         mode: 0777
 config:

integration/init_app/basic/metadata.yaml

@@ -1,3 +1,3 @@
 customer_id: "-Am-_6i5pw0u4AbspOwKN4lZUCn49u_G"
 installation_id: "3Z6uuPbVz6jTxRuXHn_l6UlYQz3hWz6-"
-release_version: "1.0.0-SNAPSHOT"
+release_version: "1.0.2"

integration/update/app_basic/expected/.ship/release.yml

@@ -12,6 +12,8 @@ assets:
         contents: |
           #!/bin/bash
           echo "tested nothing"
+          echo "customer {{repl Installation "customer_id" }}"
+          echo "install {{repl Installation "installation_id" }}"
         dest: ./scripts/test.sh
         mode: 0777
 config:

integration/update/app_basic/expected/.ship/state.json

@@ -2,13 +2,13 @@
   "v1": {
     "config": {},
     "upstream": "staging.replicated.app/some-cool-ci-tool?installation_id=3Z6uuPbVz6jTxRuXHn_l6UlYQz3hWz6-&customer_id=-Am-_6i5pw0u4AbspOwKN4lZUCn49u_G",
-    "contentSHA": "2260e2110304496fc8544b8bf51c95352cdf9300270fe7c7fa9f6e1b76855d1c",
+    "contentSHA": "6faeec976f37e880c5e70cf578412a57fbfda3b35bf8e6f73221fe5fe88f1058",
     "metadata": {
       "applicationType": "replicated.app",
       "customerID": "-Am-_6i5pw0u4AbspOwKN4lZUCn49u_G",
       "installationID": "3Z6uuPbVz6jTxRuXHn_l6UlYQz3hWz6-",
       "releaseNotes": "integration tests",
-      "version": "1.0.0-SNAPSHOT"
+      "version": "1.0.2"
     },
     "releaseName": "integration-replicated-app-basic"
   }

integration/update/app_basic/expected/installer/scripts/test.sh

@@ -1,2 +1,5 @@
 #!/bin/bash
 echo "tested nothing"
+echo "customer -Am-_6i5pw0u4AbspOwKN4lZUCn49u_G"
+echo "install 3Z6uuPbVz6jTxRuXHn_l6UlYQz3hWz6-"
+

pkg/helm/repo_add.go

@@ -26,11 +26,9 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-
-	"github.com/pkg/errors"
-
 	"syscall"
 
+	"github.com/pkg/errors"
 	"golang.org/x/crypto/ssh/terminal"
 	"k8s.io/helm/pkg/getter"
 	"k8s.io/helm/pkg/helm/helmpath"

pkg/lifecycle/render/helm/template.go

@@ -10,8 +10,6 @@ import (
 	"regexp"
 	"strings"
 
-	"k8s.io/helm/pkg/chartutil"
-
 	"github.com/emosbaugh/yaml"
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
@@ -26,6 +24,7 @@ import (
 	"github.com/replicatedhq/ship/pkg/util"
 	"github.com/spf13/afero"
 	"github.com/spf13/viper"
+	"k8s.io/helm/pkg/chartutil"
 )
 
 const (

pkg/lifecycle/render/helm/template_test.go

@@ -6,8 +6,6 @@ import (
 	"path/filepath"
 	"testing"
 
-	"k8s.io/helm/pkg/chartutil"
-
 	"github.com/golang/mock/gomock"
 	"github.com/replicatedhq/libyaml"
 	"github.com/replicatedhq/ship/pkg/api"
@@ -24,6 +22,7 @@ import (
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v2"
+	"k8s.io/helm/pkg/chartutil"
 )
 
 func TestLocalTemplater(t *testing.T) {

pkg/specs/upstream_test.go

@@ -8,11 +8,9 @@ import (
 	"net/url"
 	"testing"
 
+	"github.com/google/go-github/github"
 	"github.com/replicatedhq/ship/pkg/specs/githubclient"
-
 	"github.com/replicatedhq/ship/pkg/state"
-
-	"github.com/google/go-github/github"
 	"github.com/replicatedhq/ship/pkg/testing/logger"
 	"github.com/stretchr/testify/require"
 )

pkg/templates/installation_context.go

@@ -39,7 +39,7 @@ func (ctx *InstallationContext) FuncMap() template.FuncMap {
 			case "state_file_path":
 				return constants.StatePath
 			case "customer_id":
-				return ctx.Viper.GetString("customer-id")
+				return ctx.Meta.CustomerID
 			case "semver":
 				return ctx.Meta.Semver
 			case "channel_name":
@@ -49,7 +49,7 @@ func (ctx *InstallationContext) FuncMap() template.FuncMap {
 			case "release_id":
 				return ctx.Meta.ReleaseID
 			case "installation_id":
-				return ctx.Viper.GetString("installation-id")
+				return ctx.Meta.InstallationID
 			case "release_notes":
 				return ctx.Meta.ReleaseNotes
 			}

pkg/templates/installation_context_test.go

@@ -98,14 +98,18 @@ func testCases() []TestInstallation {
 			Expected: "It's " + constants.StatePath,
 		},
 		{
-			Name:     "customer_id",
-			Meta:     api.ReleaseMetadata{},
+			Name: "customer_id",
+			Meta: api.ReleaseMetadata{
+				CustomerID: "abc",
+			},
 			Tpl:      `It's {{repl Installation "customer_id" }}`,
 			Expected: `It's abc`,
 		},
 		{
-			Name:     "installation_id",
-			Meta:     api.ReleaseMetadata{},
+			Name: "installation_id",
+			Meta: api.ReleaseMetadata{
+				InstallationID: "xyz",
+			},
 			Tpl:      `It's {{repl Installation "installation_id" }}`,
 			Expected: `It's xyz`,
 		},