add app engine flex version #3110
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| obj["env"] = "flex" | ||
| return obj, nil |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| resource "google_app_engine_flexible_app_version" "<%= ctx[:primary_resource_id] %>" { | ||
| version_id = "v1" | ||
| service = "<%= ctx[:vars]['service_name'] %>" | ||
| runtime = "nodejs" | ||
|
|
||
| entrypoint { | ||
| shell = "node ./app.js" | ||
| } | ||
|
|
||
| deployment { | ||
| zip { | ||
| source_url = "https://storage.googleapis.com/${google_storage_bucket.bucket.name}/${google_storage_bucket_object.object.name}" | ||
| } | ||
| } | ||
|
|
||
| liveness_check { | ||
| path = "/" | ||
| } | ||
|
|
||
| readiness_check { | ||
| path = "/" | ||
| } | ||
|
|
||
| env_variables = { | ||
| port = "8080" | ||
| } | ||
|
|
||
| automatic_scaling { | ||
| cool_down_period = "120s" | ||
| cpu_utilization { | ||
| target_utilization = 0.5 | ||
| } | ||
| } | ||
|
|
||
|
|
||
| delete_service_on_destroy = true | ||
| } | ||
|
|
||
| resource "google_app_engine_flexible_app_version" "myflexapp_v2" { | ||
|
There was a problem hiding this comment. nit: I have a slight preference for these to be 2 different example blocks instead of 2 app_versions in a single example. If possible I like to have each example be a single use case so that the example can have a title block like "NodeJs Example with scaling" and a user doesn't have to parse both whole resource blocks to understand the difference between the two. As pointed out by a user aws s3 bucket does a better job of this than many of our resources. There was a problem hiding this comment. I'm totally fine with that, I copied this from the standard app (again), and it appears both versions are the same. I'm guessing the example of it was just having 2 versions to the same service? But if that doesn't seem like a great thing to show in an example, I'm happy to remove v2. There was a problem hiding this comment. The only difference I saw was |
||
| version_id = "v2" | ||
| service = "<%= ctx[:vars]['service_name'] %>" | ||
| runtime = "nodejs" | ||
|
|
||
| entrypoint { | ||
| shell = "node ./app.js" | ||
| } | ||
|
|
||
| deployment { | ||
| zip { | ||
| source_url = "https://storage.googleapis.com/${google_storage_bucket.bucket.name}/${google_storage_bucket_object.object.name}" | ||
| } | ||
| } | ||
|
|
||
| liveness_check { | ||
| path = "/" | ||
| } | ||
|
|
||
| readiness_check { | ||
| path = "/" | ||
| } | ||
|
|
||
| env_variables = { | ||
| port = "8080" | ||
| } | ||
|
|
||
| automatic_scaling { | ||
| cool_down_period = "120s" | ||
| cpu_utilization { | ||
| target_utilization = 0.5 | ||
| } | ||
| } | ||
|
|
||
| noop_on_destroy = true | ||
| } | ||
|
|
||
| resource "google_storage_bucket" "bucket" { | ||
| name = "<%= ctx[:vars]['bucket_name'] %>" | ||
| } | ||
|
|
||
| resource "google_storage_bucket_object" "object" { | ||
| name = "hello-world.zip" | ||
| bucket = google_storage_bucket.bucket.name | ||
| source = "./test-fixtures/appengine/hello-world.zip" | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| package google | ||
|
|
||
| import ( | ||
| "context" | ||
| "log" | ||
| "strings" | ||
|
|
||
| "github.com/hashicorp/terraform-plugin-sdk/helper/resource" | ||
| ) | ||
|
|
||
| // This will sweep both Standard and Flexible App Engine App Versions | ||
| func init() { | ||
| resource.AddTestSweepers("AppEngineAppVersion", &resource.Sweeper{ | ||
| Name: "AppEngineAppVersion", | ||
| F: testSweepAppEngineAppVersion, | ||
| }) | ||
| } | ||
|
|
||
| // At the time of writing, the CI only passes us-central1 as the region | ||
| func testSweepAppEngineAppVersion(region string) error { | ||
| resourceName := "AppEngineAppVersion" | ||
| log.Printf("[INFO][SWEEPER_LOG] Starting sweeper for %s", resourceName) | ||
|
|
||
| config, err := sharedConfigForRegion(region) | ||
| if err != nil { | ||
| log.Printf("[INFO][SWEEPER_LOG] error getting shared config for region: %s", err) | ||
| return err | ||
| } | ||
|
|
||
| err = config.LoadAndValidate(context.Background()) | ||
| if err != nil { | ||
| log.Printf("[INFO][SWEEPER_LOG] error loading: %s", err) | ||
| return err | ||
| } | ||
|
|
||
| servicesUrl := "https://appengine.googleapis.com/v1/apps/" + config.Project + "/services" | ||
| res, err := sendRequest(config, "GET", config.Project, servicesUrl, nil) | ||
| if err != nil { | ||
| log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", servicesUrl, err) | ||
| return nil | ||
| } | ||
|
|
||
| resourceList, ok := res["services"] | ||
| if !ok { | ||
| log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.") | ||
| return nil | ||
| } | ||
|
|
||
| rl := resourceList.([]interface{}) | ||
|
|
||
| log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName) | ||
| // items who don't match the tf-test prefix | ||
| nonPrefixCount := 0 | ||
| for _, ri := range rl { | ||
| obj := ri.(map[string]interface{}) | ||
| if obj["id"] == nil { | ||
| log.Printf("[INFO][SWEEPER_LOG] %s resource id was nil", resourceName) | ||
| return nil | ||
| } | ||
|
|
||
| id := obj["id"].(string) | ||
| // Only sweep resources with the test prefix | ||
| if !strings.HasPrefix(id, "tf-test") { | ||
| nonPrefixCount++ | ||
| continue | ||
| } | ||
|
|
||
| deleteUrl := servicesUrl + "/" + id | ||
| // Don't wait on operations as we may have a lot to delete | ||
| _, err = sendRequest(config, "DELETE", config.Project, deleteUrl, nil) | ||
| if err != nil { | ||
| log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err) | ||
| } else { | ||
| log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, id) | ||
| } | ||
| } | ||
|
|
||
| if nonPrefixCount > 0 { | ||
| log.Printf("[INFO][SWEEPER_LOG] %d items without tf_test prefix remain.", nonPrefixCount) | ||
| } | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If these are things that can be updated by other tools after create you should override the description here indicating that Terraform won't detect drift.