Skip to content

Commit ecac016

Browse files
committed
Fix type conversion behavior of cluster datasource lifecycle state
This addresses github issue #600
1 parent 0c105c7 commit ecac016

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
## 3.1.2 (Unreleased)
2+
3+
### Fixed
4+
- Fixed bug with specifying lifecycle state in container enginge cluster datasource. Issue [#600](https://github.com/terraform-providers/terraform-provider-oci/issues/600)
5+
26
## 3.1.1 (September 21, 2018)
37

48
### Fixed

oci/containerengine_cluster_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,15 @@ variable "cluster_options_add_ons_is_tiller_enabled" { default = true }
193193
variable "cluster_options_kubernetes_network_config_pods_cidr" { default = "10.1.0.0/16" }
194194
variable "cluster_options_kubernetes_network_config_services_cidr" { default = "10.2.0.0/16" }
195195
variable "cluster_options_service_lb_subnet_ids" { default = [] }
196-
variable "cluster_state" { default = [] }
196+
variable "cluster_state" { default = ["CREATING", "ACTIVE", FAILED", "DELETING", "DELETED", "UPDATING"] }
197197
198198
data "oci_containerengine_clusters" "test_clusters" {
199199
#Required
200200
compartment_id = "${var.compartment_id}"
201201
202202
#Optional
203203
name = "${var.cluster_name}"
204+
state = "${var.cluster_state}"
204205
205206
filter {
206207
name = "id"
@@ -224,6 +225,7 @@ data "oci_containerengine_clusters" "test_clusters" {
224225
resource.TestCheckResourceAttr(datasourceName, "clusters.0.options.0.kubernetes_network_config.0.pods_cidr", "10.1.0.0/16"),
225226
resource.TestCheckResourceAttr(datasourceName, "clusters.0.options.0.kubernetes_network_config.0.services_cidr", "10.2.0.0/16"),
226227
resource.TestCheckResourceAttr(datasourceName, "clusters.0.options.0.service_lb_subnet_ids.#", "2"),
228+
resource.TestCheckResourceAttrSet(datasourceName, "clusters.0.state"),
227229
resource.TestCheckResourceAttrSet(datasourceName, "clusters.0.vcn_id"),
228230
),
229231
},

oci/containerengine_clusters_data_source.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ func (s *ClustersDataSourceCrud) Get() error {
7171

7272
if states, ok := s.D.GetOkExists("state"); ok {
7373
var enumStates []oci_containerengine.ListClustersLifecycleStateEnum
74-
for _, r := range states.([]string) {
75-
enumStates = append(enumStates, oci_containerengine.ListClustersLifecycleStateEnum(r))
74+
for _, r := range states.([]interface{}) {
75+
enumStates = append(enumStates, oci_containerengine.ListClustersLifecycleStateEnum(r.(string)))
7676
}
7777
request.LifecycleState = enumStates
7878
}

0 commit comments

Comments
 (0)