From b96b579ff4d4b4c8997aac3927aab2ae8d62d5a0 Mon Sep 17 00:00:00 2001
From: Scott Bloch-Wehba-Seaward <34253460+sbwsg@users.noreply.github.com>
Date: Thu, 21 Dec 2017 12:25:49 -0500
Subject: [PATCH] feat(provider/appengine): enable flex deployments (#2241)

Allow App Engine deployments with a built container image and app.yaml.
---
 .../DeployAppengineDescription.groovy         |  1 +
 .../ops/DeployAppengineAtomicOperation.groovy | 40 +++++++++++++++++--
 ...DeployAppengineDescriptionValidator.groovy | 11 ++++-
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/description/DeployAppengineDescription.groovy b/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/description/DeployAppengineDescription.groovy
index 11c1958e117..572629739ce 100644
--- a/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/description/DeployAppengineDescription.groovy
+++ b/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/description/DeployAppengineDescription.groovy
@@ -37,4 +37,5 @@ class DeployAppengineDescription extends AbstractAppengineCredentialsDescription
   List<String> configFiles
   Boolean promote
   Boolean stopPreviousVersion
+  String containerImageUrl // app engine flex only
 }
diff --git a/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/ops/DeployAppengineAtomicOperation.groovy b/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/ops/DeployAppengineAtomicOperation.groovy
index ee5320e23da..269c244aa92 100644
--- a/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/ops/DeployAppengineAtomicOperation.groovy
+++ b/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/ops/DeployAppengineAtomicOperation.groovy
@@ -53,21 +53,32 @@ class DeployAppengineAtomicOperation implements AtomicOperation<DeploymentResult
 
   DeployAppengineDescription description
   boolean usesGcs
+  boolean containerDeployment
 
   DeployAppengineAtomicOperation(DeployAppengineDescription description) {
     this.description = description
-    this.usesGcs = description.repositoryUrl.startsWith("gs://")
+    this.containerDeployment = description.containerImageUrl?.trim()
+    this.usesGcs = !this.containerDeployment && description.repositoryUrl.startsWith("gs://")
   }
 
   /**
    * curl -X POST -H "Content-Type: application/json" -d '[ { "createServerGroup": { "application": "myapp", "stack": "stack", "freeFormDetails": "details", "repositoryUrl": "https://github.com/organization/project.git", "branch": "feature-branch", "credentials": "my-appengine-account", "configFilepaths": ["app.yaml"] } } ]' "http://localhost:7002/appengine/ops"
    * curl -X POST -H "Content-Type: application/json" -d '[ { "createServerGroup": { "application": "myapp", "stack": "stack", "freeFormDetails": "details", "repositoryUrl": "https://github.com/organization/project.git", "branch": "feature-branch", "credentials": "my-appengine-account", "configFilepaths": ["app.yaml"], "promote": true, "stopPreviousVersion": true } } ]' "http://localhost:7002/appengine/ops"
    * curl -X POST -H "Content-Type: application/json" -d '[ { "createServerGroup": { "application": "myapp", "stack": "stack", "freeFormDetails": "details", "repositoryUrl": "https://github.com/organization/project.git", "branch": "feature-branch", "credentials": "my-appengine-account", "configFilepaths": ["runtime: python27\napi_version: 1\nthreadsafe: true\nmanual_scaling:\n  instances: 5\ninbound_services:\n - warmup\nhandlers:\n - url: /.*\n   script: main.app"],} } ]' "http://localhost:7002/appengine/ops"
+   * curl -X POST -H "Content-Type: application/json" -d '[ { "createServerGroup": { "application": "myapp", "stack": "stack", "freeFormDetails": "details", "credentials": "my-appengine-account", "containerImageUrl": "gcr.io/my-project/my-image:my-tag", "configFiles": ["env: flex\nruntime: custom\nmanual_scaling:\n  instances: 1\nresources:\n  cpu: 1\n  memory_gb: 0.5\n  disk_size_gb: 10"] } } ]' "http://localhost:7002/appengine/ops"
    */
   @Override
   DeploymentResult operate(List priorOutputs) {
     def  baseDir = description.credentials.localRepositoryDirectory
-    def  directoryPath = getFullDirectoryPath(baseDir, description.repositoryUrl)
+
+    String directoryId
+    if (containerDeployment) {
+      directoryId = description.containerImageUrl
+    } else {
+      directoryId = description.repositoryUrl
+    }
+
+    def directoryPath = getFullDirectoryPath(baseDir, directoryId)
 
     /*
     * We can't allow concurrent deploy operations on the same local repository.
@@ -77,7 +88,13 @@ class DeployAppengineAtomicOperation implements AtomicOperation<DeploymentResult
     return AppengineMutexRepository.atomicWrapper(directoryPath, {
       task.updateStatus BASE_PHASE, "Initializing creation of version..."
       def result = new DeploymentResult()
-      def newVersionName = deploy(cloneOrUpdateLocalRepository(directoryPath, 1))
+      String newVersionName
+      if (containerDeployment) {
+        createEmptyDirectory(directoryPath)
+        newVersionName = deploy(directoryPath)
+      } else {
+        newVersionName = deploy(cloneOrUpdateLocalRepository(directoryPath, 1))
+      }
       def region = description.credentials.region
       result.serverGroupNames = Arrays.asList("$region:$newVersionName".toString())
       result.serverGroupNameByRegion[region] = newVersionName
@@ -85,6 +102,16 @@ class DeployAppengineAtomicOperation implements AtomicOperation<DeploymentResult
     })
   }
 
+  void createEmptyDirectory(String path) {
+    File directory = new File(path)
+    if (directory.exists()) {
+      directory.deleteDir()
+    }
+    if (!directory.mkdirs()) {
+      throw new AppengineOperationException("Failed to create directory: $path")
+    }
+  }
+
   String cloneOrUpdateLocalRepository(String directoryPath, Integer retryCount) {
     def repositoryUrl = description.repositoryUrl
     def directory = new File(directoryPath)
@@ -145,7 +172,9 @@ class DeployAppengineAtomicOperation implements AtomicOperation<DeploymentResult
                                                                          description.stack,
                                                                          description.freeFormDetails,
                                                                          false)
-    def writtenFullConfigFilePaths = writeConfigFiles(description.configFiles, repositoryPath, applicationDirectoryRoot)
+    def imageUrl = description.containerImageUrl
+    def configFiles = description.configFiles
+    def writtenFullConfigFilePaths = writeConfigFiles(configFiles, repositoryPath, applicationDirectoryRoot)
     def repositoryFullConfigFilePaths =
       (description.configFilepaths?.collect { Paths.get(repositoryPath, applicationDirectoryRoot ?: '.', it).toString() } ?: []) as List<String>
     def deployCommand = ["gcloud"]
@@ -158,6 +187,9 @@ class DeployAppengineAtomicOperation implements AtomicOperation<DeploymentResult
     deployCommand << (description.stopPreviousVersion ? "--stop-previous-version": "--no-stop-previous-version")
     deployCommand << "--project=$project"
     deployCommand << "--account=$accountEmail"
+    if (containerDeployment) {
+      deployCommand << "--image-url=$imageUrl"
+    }
 
     task.updateStatus BASE_PHASE, "Deploying version $versionName..."
     try {
diff --git a/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/validators/DeployAppengineDescriptionValidator.groovy b/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/validators/DeployAppengineDescriptionValidator.groovy
index bb1491f7c01..7fea1b86f37 100644
--- a/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/validators/DeployAppengineDescriptionValidator.groovy
+++ b/clouddriver-appengine/src/main/groovy/com/netflix/spinnaker/clouddriver/appengine/deploy/validators/DeployAppengineDescriptionValidator.groovy
@@ -39,7 +39,9 @@ class DeployAppengineDescriptionValidator extends DescriptionValidator<DeployApp
       return
     }
 
-    if (!description.repositoryUrl.startsWith("gs://")) {
+    boolean isContainerDeployment = description.containerImageUrl?.trim()
+
+    if (!isContainerDeployment && !description.repositoryUrl.startsWith("gs://")) {
       if (!helper.validateGitCredentials(description.credentials.gitCredentials,
                                          description.gitCredentialType,
                                          description.credentials.name,
@@ -49,10 +51,15 @@ class DeployAppengineDescriptionValidator extends DescriptionValidator<DeployApp
       helper.validateNotEmpty(description.branch, "branch")
     }
 
+    if (isContainerDeployment) {
+      helper.validateNotEmpty(description.containerImageUrl, "containerImageUrl")
+    } else {
+      helper.validateNotEmpty(description.repositoryUrl, "repositoryUrl")
+    }
+
     helper.validateApplication(description.application, "application")
     helper.validateStack(description.stack, "stack")
     helper.validateDetails(description.freeFormDetails, "freeFormDetails")
-    helper.validateNotEmpty(description.repositoryUrl, "repositoryUrl")
 
     if (!(description.configFilepaths || description.configFiles)) {
       helper.validateNotEmpty(description.configFilepaths, "configFilepaths")