Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make cloud composer environment image version updateable. #1755

Merged
merged 2 commits into from
May 29, 2019
Merged

Make cloud composer environment image version updateable. #1755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b99cc50
Make cloud composer environment image version updateable.
jmcarp May 13, 2019
2b68b3c
Update tracked submodules -> HEAD on Wed May 29 17:55:17 UTC 2019
modular-magician May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/terraform
Open in desktop
Submodule terraform updated from 71221b to be8a25
2 changes: 1 addition & 1 deletion build/terraform-beta
Open in desktop
Submodule terraform-beta updated from 7cab26 to d00db0
20 changes: 18 additions & 2 deletions third_party/terraform/resources/resource_composer_environment.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ func resourceComposerEnvironment() *schema.Resource {
Computed: true,
<% unless version == 'ga' -%>
Optional: true,
ForceNew: true,
ValidateFunc: validateRegexp(composerEnvironmentVersionRegexp),
DiffSuppressFunc: composerImageVersionDiffSuppress,
},
Expand Down Expand Up @@ -333,8 +332,25 @@ func resourceComposerEnvironmentUpdate(d *schema.ResourceData, meta interface{})
return err
}

if d.HasChange("config.0.software_config.0.airflow_config_overrides") {
<% unless version == 'ga' -%>
if d.HasChange("config.0.software_config.0.image_version") {
patchObj := &composer.Environment{
Config: &composer.EnvironmentConfig{
SoftwareConfig: &composer.SoftwareConfig{},
},
}
if config != nil && config.SoftwareConfig != nil {
patchObj.Config.SoftwareConfig.ImageVersion = config.SoftwareConfig.ImageVersion
}
err = resourceComposerEnvironmentPatchField("config.softwareConfig.imageVersion", patchObj, d, tfConfig)
if err != nil {
return err
}
d.SetPartial("config")
}
<% end -%>

if d.HasChange("config.0.software_config.0.airflow_config_overrides") {
patchObj := &composer.Environment{
Config: &composer.EnvironmentConfig{
SoftwareConfig: &composer.SoftwareConfig{
Expand Down
8 changes: 6 additions & 2 deletions third_party/terraform/tests/resource_composer_environment_test.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,8 @@ func testAccComposerEnvironmentDestroy(s *terraform.State) error {
func testAccComposerEnvironment_basic(name string) string {
return fmt.Sprintf(`
resource "google_composer_environment" "test" {
name = "%s"
region = "us-central1"
name = "%s"
region = "us-central1"
}
`, name)
}
Expand All @@ -295,6 +295,10 @@ resource "google_composer_environment" "test" {
node_count = 4

software_config {
<% unless version == 'ga' -%>
image_version = "composer-1.7.0-airflow-1.10.2"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah sorry I didn't catch this earlier- this also needs beta-only guards, since without it the test in the GA provider will destroy/create instead of doing an update.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, updated.

<% end -%>

airflow_config_overrides = {
core-load_example = "True"
}
Expand Down