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

Jump to bottom

d/kubernetes_service_version: add default_version attribute #25953

Merged
merged 1 commit into from
May 15, 2024
Merged

d/kubernetes_service_version: add default_version attribute #25953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 21 additions & 1 deletion internal/services/containers/kubernetes_service_version_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ func dataSourceKubernetesServiceVersions() *pluginsdk.Resource {
Computed: true,
},

"default_version": {
Type: pluginsdk.TypeString,
Computed: true,
},

"include_preview": {
Type: pluginsdk.TypeBool,
Optional: true,
Expand Down Expand Up @@ -75,7 +80,11 @@ func dataSourceKubernetesServiceVersionsRead(d *pluginsdk.ResourceData, meta int

lv, err := version.NewVersion("0.0.0")
if err != nil {
return fmt.Errorf("Cannot set version baseline (likely an issue in go-version): %+v", err)
return fmt.Errorf("cannot set version baseline (likely an issue in go-version): %+v", err)
}
dv, err := version.NewVersion("0.0.0")
if err != nil {
return fmt.Errorf("cannot set default version baseline (likely an issue in go-version): %+v", err)
}

var versions []string
Expand All @@ -85,6 +94,7 @@ func dataSourceKubernetesServiceVersionsRead(d *pluginsdk.ResourceData, meta int
if model := listResp.Model; model != nil {
for _, rawV := range model.Properties.Orchestrators {
isPreview := false
isDefault := false
orchestratorType := rawV.OrchestratorType
kubeVersion := rawV.OrchestratorVersion

Expand Down Expand Up @@ -120,12 +130,22 @@ func dataSourceKubernetesServiceVersionsRead(d *pluginsdk.ResourceData, meta int
if v.GreaterThan(lv) {
lv = v
}

if rawV.Default != nil {
isDefault = *rawV.Default
log.Printf("[DEBUG] Default is %t", isDefault)
}

if isDefault && v.GreaterThan(dv) {
dv = v
}
}
}

d.SetId(id.ID())
d.Set("versions", versions)
d.Set("latest_version", lv.Original())
d.Set("default_version", dv.Original())

return nil
}
2 changes: 2 additions & 0 deletions internal/services/containers/kubernetes_service_version_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ func TestAccDataSourceAzureRMKubernetesServiceVersions_filtered(t *testing.T) {
acceptance.TestMatchResourceAttr(data.ResourceName, "versions.0", kvrx),
check.That(data.ResourceName).Key("latest_version").Exists(),
acceptance.TestMatchResourceAttr(data.ResourceName, "latest_version", kvrx),
check.That(data.ResourceName).Key("default_version").Exists(),
),
},
})
Expand All @@ -65,6 +66,7 @@ func TestAccDataSourceAzureRMKubernetesServiceVersions_nopreview(t *testing.T) {
acceptance.TestMatchResourceAttr(data.ResourceName, "versions.0", kvrx),
check.That(data.ResourceName).Key("latest_version").Exists(),
acceptance.TestMatchResourceAttr(data.ResourceName, "latest_version", kvrx),
check.That(data.ResourceName).Key("default_version").Exists(),
),
},
})
Expand Down
2 changes: 2 additions & 0 deletions website/docs/d/kubernetes_service_versions.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ output "latest_version" {

* `latest_version` - The most recent version available. If `include_preview == false`, this is the most recent non-preview version available.

* `default_version` - The N-1 minor non-preview version and latest patch.

## Timeouts

The `timeouts` block allows you to specify [timeouts](https://www.terraform.io/language/resources/syntax#operation-timeouts) for certain actions:
Expand Down
Loading