Unify ship release query

replicatedhq · Jun 20, 2019 · bfdf40a · bfdf40a
1 parent fc2e6cf
commit bfdf40a
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 59 deletions.
diff --git a/integration/init_app/amazon-eks-template/expected/.ship/state.json b/integration/init_app/amazon-eks-template/expected/.ship/state.json
@@ -22,7 +22,7 @@
     "upstreamContents": {
       "appRelease": {
         "id": "NyhODuspYvV9pTHlmMt20KAxbMAE8swq",
-        "sequence": 0,
+        "sequence": 2971,
         "channelId": "iEKGvV-NI-i6uFS89JAbdJCzAXP1b7wr",
         "channelName": "integration replicated.app amazon-eks-template",
         "channelIcon": "",

diff --git a/integration/init_app/basic/expected/.ship/state.json b/integration/init_app/basic/expected/.ship/state.json
@@ -22,7 +22,7 @@
     "upstreamContents": {
       "appRelease": {
         "id": "pAb_dFxe4M4TdvkPWSdgDhgtpDbOcGAM",
-        "sequence": 0,
+        "sequence": 4603,
         "channelId": "lD4lzjnjwOYzKbNsjK0JlcpzF19PswXz",
         "channelName": "integration replicated.app basic",
         "channelIcon": "",

diff --git a/integration/init_app/docker-asset/expected/.ship/state.json b/integration/init_app/docker-asset/expected/.ship/state.json
@@ -22,7 +22,7 @@
     "upstreamContents": {
       "appRelease": {
         "id": "jDtI-DiraCbkN5euJHmbS3kIFw4N1Iw9",
-        "sequence": 0,
+        "sequence": 9091,
         "channelId": "_KVsR5SFu9Rj2IR6dxPhuBYcNIKtw6SI",
         "channelName": "integration-test-docker",
         "channelIcon": "",

diff --git a/integration/init_app/github-template-func/expected/.ship/state.json b/integration/init_app/github-template-func/expected/.ship/state.json
@@ -23,7 +23,7 @@
     "upstreamContents": {
       "appRelease": {
         "id": "ZibGNlJOl0RbgXiFKk358iGVL8lFOn26",
-        "sequence": 0,
+        "sequence": 9073,
         "channelId": "M2JHDvnDhJbrDNRBQ1m-eEDRXbPiSLg9",
         "channelName": "integration replicated.app github-template-func",
         "channelIcon": "",

diff --git a/integration/init_app/helm-github/expected/.ship/state.json b/integration/init_app/helm-github/expected/.ship/state.json
@@ -21,7 +21,7 @@
     "upstreamContents": {
       "appRelease": {
         "id": "cZB0VTZLBexn0s53sMzVB0Id3VvSPcCZ",
-        "sequence": 0,
+        "sequence": 6060,
         "channelId": "t_qVrkESBiqOa8ZraseeS38bXy-qgpSe",
         "channelName": "integration replicated.app helm-github",
         "channelIcon": "",

diff --git a/integration/init_app/installation-template-func/expected/.ship/state.json b/integration/init_app/installation-template-func/expected/.ship/state.json
@@ -21,7 +21,7 @@
     "upstreamContents": {
       "appRelease": {
         "id": "VFOvxrc3Bpu1doy2AtFGoypU6skZvXSZ",
-        "sequence": 0,
+        "sequence": 6680,
         "channelId": "PH6juE8b84A4zOCO-SVzVNS_OHs-LEl3",
         "channelName": "integration replicated.app installation-template-func",
         "channelIcon": "",

diff --git a/integration/update/app_basic/expected/.ship/state.json b/integration/update/app_basic/expected/.ship/state.json
@@ -21,7 +21,7 @@
     "upstreamContents": {
       "appRelease": {
         "id": "pAb_dFxe4M4TdvkPWSdgDhgtpDbOcGAM",
-        "sequence": 0,
+        "sequence": 4603,
         "channelId": "lD4lzjnjwOYzKbNsjK0JlcpzF19PswXz",
         "channelName": "integration replicated.app basic",
         "channelIcon": "",

diff --git a/pkg/specs/replicatedapp/graphql.go b/pkg/specs/replicatedapp/graphql.go
@@ -17,57 +17,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-const GetAppspecQuery = `
-query($semver: String) {
-  shipRelease (semver: $semver) {
-    id
-    channelId
-    channelName
-    channelIcon
-    semver
-    releaseNotes
-    spec
-    images {
-      url
-      source
-      appSlug
-      imageKey
-    }
-    githubContents {
-      repo
-      path
-      ref
-      files {
-        name
-        path
-        sha
-        size
-        data
-      }
-    }
-    entitlements {
-      values {
-        key
-        value
-        labels {
-          key
-          value
-        }
-      }
-      meta {
-        customerID
-        lastUpdated
-      }
-      signature
-    }
-    created
-    registrySecret
-  }
-}`
-
-const GetSlugAppSpecQuery = `
-query($appSlug: String!, $licenseID: String, $releaseID: String, $semver: String) {
-  shipSlugRelease (appSlug: $appSlug, licenseID: $licenseID, releaseID: $releaseID, semver: $semver) {
+const ShipRelease = `
     id
     sequence
     channelId
@@ -116,7 +66,19 @@ query($appSlug: String!, $licenseID: String, $releaseID: String, $semver: String
       signature
     }
     created
-    registrySecret
+    registrySecret`
+
+const GetAppspecQuery = `
+query($semver: String) {
+  shipRelease (semver: $semver) {
+` + ShipRelease + `
+  }
+}`
+
+const GetSlugAppSpecQuery = `
+query($appSlug: String!, $licenseID: String, $releaseID: String, $semver: String) {
+  shipSlugRelease (appSlug: $appSlug, licenseID: $licenseID, releaseID: $releaseID, semver: $semver) {
+` + ShipRelease + `
   }
 }`