From b1ef55a60ef8ef9ebb5198a122e16749645a3010 Mon Sep 17 00:00:00 2001 From: Praveengostu Date: Fri, 6 Jul 2018 16:22:14 +0530 Subject: [PATCH] Fix284 (#312) * vendor latest bluemix-go * Make account id optional * Doc changes for container resources --- ibm/data_source_ibm_container_cluster.go | 2 +- ...ata_source_ibm_container_cluster_config.go | 2 +- ...ource_ibm_container_cluster_config_test.go | 11 +- ibm/data_source_ibm_container_cluster_test.go | 18 +- ...a_source_ibm_container_cluster_versions.go | 2 +- ...rce_ibm_container_cluster_versions_test.go | 15 +- ...ata_source_ibm_container_cluster_worker.go | 2 +- ...ource_ibm_container_cluster_worker_test.go | 11 +- ibm/resource_ibm_container_bind_service.go | 2 +- ...esource_ibm_container_bind_service_test.go | 13 +- ibm/resource_ibm_container_cluster.go | 2 +- ibm/resource_ibm_container_cluster_test.go | 12 +- .../api/container/containerv1/api_service.go | 6 + .../api/container/containerv1/clusters.go | 7 +- .../api/container/containerv1/properties.go | 53 +++++ .../bluemix-go/endpoints/endpoints.go | 4 + .../examples/container/create/main.go | 38 +--- vendor/vendor.json | 206 +++++++++--------- .../docs/d/container_cluster.html.markdown | 2 +- .../d/container_cluster_config.html.markdown | 2 +- .../container_cluster_versions.html.markdown | 2 +- .../d/container_cluster_worker.html.markdown | 2 +- .../r/container_bind_service.html.markdown | 2 +- .../docs/r/container_cluster.html.markdown | 2 +- 24 files changed, 194 insertions(+), 224 deletions(-) create mode 100644 vendor/github.com/IBM-Cloud/bluemix-go/api/container/containerv1/properties.go diff --git a/ibm/data_source_ibm_container_cluster.go b/ibm/data_source_ibm_container_cluster.go index 428547151b1..1f1b03d7cd2 100644 --- a/ibm/data_source_ibm_container_cluster.go +++ b/ibm/data_source_ibm_container_cluster.go @@ -172,7 +172,7 @@ func dataSourceIBMContainerCluster() *schema.Resource { "account_guid": { Description: "The bluemix account guid this cluster belongs to", Type: schema.TypeString, - Required: true, + Optional: true, }, }, } diff --git a/ibm/data_source_ibm_container_cluster_config.go b/ibm/data_source_ibm_container_cluster_config.go index 805989bf301..9e44039dd8e 100644 --- a/ibm/data_source_ibm_container_cluster_config.go +++ b/ibm/data_source_ibm_container_cluster_config.go @@ -30,7 +30,7 @@ func dataSourceIBMContainerClusterConfig() *schema.Resource { "account_guid": { Description: "The bluemix account guid this cluster belongs to", Type: schema.TypeString, - Required: true, + Optional: true, }, "cluster_name_id": { Description: "The name/id of the cluster", diff --git a/ibm/data_source_ibm_container_cluster_config_test.go b/ibm/data_source_ibm_container_cluster_config_test.go index e9555ab04f0..0efc6d10ff7 100644 --- a/ibm/data_source_ibm_container_cluster_config_test.go +++ b/ibm/data_source_ibm_container_cluster_config_test.go @@ -55,18 +55,10 @@ func TestAccIBMContainerClusterConfigDataSource_WithoutOptionalFields(t *testing func testAccCheckIBMContainerClusterDataSourceConfigWithoutOptionalFields(clustername string) string { return fmt.Sprintf(` -data "ibm_org" "testacc_ds_org" { - org = "%s" -} - -data "ibm_account" "testacc_acc" { - org_guid = "${data.ibm_org.testacc_ds_org.id}" -} resource "ibm_container_cluster" "testacc_cluster" { name = "%s" datacenter = "%s" - account_guid = "${data.ibm_account.testacc_acc.id}" worker_num = 1 machine_type = "%s" hardware = "shared" @@ -74,9 +66,8 @@ resource "ibm_container_cluster" "testacc_cluster" { private_vlan_id = "%s" } data "ibm_container_cluster_config" "testacc_ds_cluster" { - account_guid = "${data.ibm_account.testacc_acc.id}" cluster_name_id = "${ibm_container_cluster.testacc_cluster.id}" -}`, cfOrganization, clustername, datacenter, machineType, publicVlanID, privateVlanID) +}`, clustername, datacenter, machineType, publicVlanID, privateVlanID) } func testAccCheckIBMContainerClusterDataSourceConfig(clustername string) string { diff --git a/ibm/data_source_ibm_container_cluster_test.go b/ibm/data_source_ibm_container_cluster_test.go index 50da019ce54..af0c32fe04c 100644 --- a/ibm/data_source_ibm_container_cluster_test.go +++ b/ibm/data_source_ibm_container_cluster_test.go @@ -32,14 +32,14 @@ func TestAccIBMContainerClusterDataSource_basic(t *testing.T) { }) } -func TestAccIBMContainerClusterDataSourceWithOutOrgSpace(t *testing.T) { +func TestAccIBMContainerClusterDataSourceWithOutOrgSpaceAccount(t *testing.T) { clusterName := fmt.Sprintf("terraform_%d", acctest.RandInt()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccCheckIBMContainerClusterDataSourceWithOutOrgSpace(clusterName), + Config: testAccCheckIBMContainerClusterDataSourceWithOutOrgSpaceAccount(clusterName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr("data.ibm_container_cluster.testacc_ds_cluster", "worker_count", "1"), resource.TestCheckResourceAttr("data.ibm_container_cluster.testacc_ds_cluster", "worker_pools.#", "1"), @@ -124,19 +124,12 @@ data "ibm_container_cluster" "testacc_ds_cluster" { `, cfOrganization, cfOrganization, cfSpace, clusterName, datacenter, machineType, publicVlanID, privateVlanID, subnetID, serviceName, serviceKeyName) } -func testAccCheckIBMContainerClusterDataSourceWithOutOrgSpace(clusterName string) string { +func testAccCheckIBMContainerClusterDataSourceWithOutOrgSpaceAccount(clusterName string) string { return fmt.Sprintf(` -data "ibm_org" "testacc_ds_org" { - org = "%s" -} -data "ibm_account" "testacc_acc" { - org_guid = "${data.ibm_org.testacc_ds_org.id}" -} resource "ibm_container_cluster" "testacc_cluster" { name = "%s" datacenter = "%s" - account_guid = "${data.ibm_account.testacc_acc.id}" - worker_num = 1 + worker_num = 1 machine_type = "%s" hardware = "shared" public_vlan_id = "%s" @@ -144,8 +137,7 @@ resource "ibm_container_cluster" "testacc_cluster" { subnet_id = ["%s"] } data "ibm_container_cluster" "testacc_ds_cluster" { - account_guid = "${data.ibm_account.testacc_acc.id}" cluster_name_id = "${ibm_container_cluster.testacc_cluster.id}" } -`, cfOrganization, clusterName, datacenter, machineType, publicVlanID, privateVlanID, subnetID) +`, clusterName, datacenter, machineType, publicVlanID, privateVlanID, subnetID) } diff --git a/ibm/data_source_ibm_container_cluster_versions.go b/ibm/data_source_ibm_container_cluster_versions.go index c71610bde4c..aaf5dd789d5 100644 --- a/ibm/data_source_ibm_container_cluster_versions.go +++ b/ibm/data_source_ibm_container_cluster_versions.go @@ -24,7 +24,7 @@ func dataSourceIBMContainerClusterVersions() *schema.Resource { "account_guid": { Description: "The bluemix account guid this cluster belongs to", Type: schema.TypeString, - Required: true, + Optional: true, }, "valid_kube_versions": { Description: "List supported kube-versions", diff --git a/ibm/data_source_ibm_container_cluster_versions_test.go b/ibm/data_source_ibm_container_cluster_versions_test.go index 99c0b412dfe..4f7ee6c40a2 100644 --- a/ibm/data_source_ibm_container_cluster_versions_test.go +++ b/ibm/data_source_ibm_container_cluster_versions_test.go @@ -28,7 +28,7 @@ func TestAccIBMContainerClusterVersionsDataSource_WithoutOptionalFields(t *testi Providers: testAccProviders, Steps: []resource.TestStep{ resource.TestStep{ - Config: testAccCheckIBMContainerClusterVersionsDataSourceWithoutOptionalFields(), + Config: testAccCheckIBMContainerClusterVersionsDataSourceWithoutOptionalFields, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("data.ibm_container_cluster_versions.versions", "valid_kube_versions.0"), ), @@ -57,16 +57,7 @@ data "ibm_container_cluster_versions" "versions" { `, cfOrganization, cfOrganization, cfSpace) } -func testAccCheckIBMContainerClusterVersionsDataSourceWithoutOptionalFields() string { - return fmt.Sprintf(` -data "ibm_org" "testacc_ds_org" { - org = "%s" -} -data "ibm_account" "testacc_acc" { - org_guid = "${data.ibm_org.testacc_ds_org.id}" -} +const testAccCheckIBMContainerClusterVersionsDataSourceWithoutOptionalFields = ` data "ibm_container_cluster_versions" "versions" { - account_guid = "${data.ibm_account.testacc_acc.id}" -} -`, cfOrganization) } +` diff --git a/ibm/data_source_ibm_container_cluster_worker.go b/ibm/data_source_ibm_container_cluster_worker.go index 6b2578f7dac..e4cc4b9badc 100644 --- a/ibm/data_source_ibm_container_cluster_worker.go +++ b/ibm/data_source_ibm_container_cluster_worker.go @@ -55,7 +55,7 @@ func dataSourceIBMContainerClusterWorker() *schema.Resource { "account_guid": { Description: "The bluemix account guid this cluster belongs to", Type: schema.TypeString, - Required: true, + Optional: true, }, }, } diff --git a/ibm/data_source_ibm_container_cluster_worker_test.go b/ibm/data_source_ibm_container_cluster_worker_test.go index 4fa97106e71..5b6a86af839 100644 --- a/ibm/data_source_ibm_container_cluster_worker_test.go +++ b/ibm/data_source_ibm_container_cluster_worker_test.go @@ -42,17 +42,10 @@ func TestAccIBMContainerClusterWorkerDataSource_WithoutOptionalFields(t *testing func testAccCheckIBMContainerClusterWorkerDataSourceConfigWithoutOptionalFields(clusterName string) string { return fmt.Sprintf(` -data "ibm_org" "org" { - org = "%s" -} -data "ibm_account" "acc" { - org_guid = "${data.ibm_org.org.id}" -} resource "ibm_container_cluster" "testacc_cluster" { name = "%s" datacenter = "%s" - account_guid = "${data.ibm_account.acc.id}" worker_num = 1 machine_type = "%s" hardware = "shared" @@ -60,14 +53,12 @@ resource "ibm_container_cluster" "testacc_cluster" { private_vlan_id = "%s" } data "ibm_container_cluster" "testacc_ds_cluster" { - account_guid = "${data.ibm_account.acc.id}" cluster_name_id = "${ibm_container_cluster.testacc_cluster.id}" } data "ibm_container_cluster_worker" "testacc_ds_worker" { - account_guid = "${data.ibm_account.acc.id}" worker_id = "${data.ibm_container_cluster.testacc_ds_cluster.workers[0]}" } -`, cfOrganization, clusterName, datacenter, machineType, publicVlanID, privateVlanID) +`, clusterName, datacenter, machineType, publicVlanID, privateVlanID) } func testAccCheckIBMContainerClusterWorkerDataSourceConfig(clusterName string) string { diff --git a/ibm/resource_ibm_container_bind_service.go b/ibm/resource_ibm_container_bind_service.go index 533efbf691e..c2de34229f7 100644 --- a/ibm/resource_ibm_container_bind_service.go +++ b/ibm/resource_ibm_container_bind_service.go @@ -74,7 +74,7 @@ func resourceIBMContainerBindService() *schema.Resource { "account_guid": { Description: "The bluemix account guid this cluster belongs to", Type: schema.TypeString, - Required: true, + Optional: true, ForceNew: true, }, "tags": { diff --git a/ibm/resource_ibm_container_bind_service_test.go b/ibm/resource_ibm_container_bind_service_test.go index 48f9d852e7a..e16e7c62a0e 100644 --- a/ibm/resource_ibm_container_bind_service_test.go +++ b/ibm/resource_ibm_container_bind_service_test.go @@ -73,25 +73,15 @@ func TestAccIBMContainerBindService_WithoutOptionalFields(t *testing.T) { func testAccCheckIBMContainerBindService_WithoutOptionalFields(clusterName, serviceName, serviceKey string) string { return fmt.Sprintf(` -data "ibm_org" "org" { - org = "%s" -} data "ibm_space" "space" { org = "%s" space = "%s" } -data "ibm_account" "acc" { - org_guid = "${data.ibm_org.org.id}" -} resource "ibm_container_cluster" "testacc_cluster" { name = "%s" datacenter = "%s" - org_guid = "${data.ibm_org.org.id}" - space_guid = "${data.ibm_space.space.id}" - account_guid = "${data.ibm_account.acc.id}" - worker_num = 1 machine_type = "%s" @@ -116,9 +106,8 @@ resource "ibm_container_bind_service" "bind_service" { cluster_name_id = "${ibm_container_cluster.testacc_cluster.name}" service_instance_id = "${ibm_service_instance.service.id}" namespace_id = "default" - account_guid = "${data.ibm_account.acc.id}" } - `, cfOrganization, cfOrganization, cfSpace, clusterName, datacenter, machineType, publicVlanID, privateVlanID, serviceName, serviceKey) + `, cfOrganization, cfSpace, clusterName, datacenter, machineType, publicVlanID, privateVlanID, serviceName, serviceKey) } func testAccCheckIBMContainerBindService_basic(clusterName, serviceName, serviceKey string) string { diff --git a/ibm/resource_ibm_container_cluster.go b/ibm/resource_ibm_container_cluster.go index b7bcb9c2488..b4392326588 100644 --- a/ibm/resource_ibm_container_cluster.go +++ b/ibm/resource_ibm_container_cluster.go @@ -227,7 +227,7 @@ func resourceIBMContainerCluster() *schema.Resource { "account_guid": { Description: "The bluemix account guid this cluster belongs to", Type: schema.TypeString, - Required: true, + Optional: true, ForceNew: true, }, "wait_time_minutes": { diff --git a/ibm/resource_ibm_container_cluster_test.go b/ibm/resource_ibm_container_cluster_test.go index 463675a7c8e..3ef965a84f7 100644 --- a/ibm/resource_ibm_container_cluster_test.go +++ b/ibm/resource_ibm_container_cluster_test.go @@ -540,20 +540,10 @@ resource "ibm_container_cluster" "testacc_cluster" { func testAccCheckIBMContainerClusterOptionalOrgSpace_basic(clusterName string) string { return fmt.Sprintf(` -data "ibm_org" "org" { - org = "%s" -} - -data "ibm_account" "acc" { - org_guid = "${data.ibm_org.org.id}" -} - resource "ibm_container_cluster" "testacc_cluster" { name = "%s" datacenter = "%s" - account_guid = "${data.ibm_account.acc.id}" - worker_num = 2 machine_type = "%s" @@ -562,7 +552,7 @@ resource "ibm_container_cluster" "testacc_cluster" { private_vlan_id = "%s" no_subnet = true disk_encryption = true -} `, cfOrganization, clusterName, datacenter, machineType, publicVlanID, privateVlanID) +} `, clusterName, datacenter, machineType, publicVlanID, privateVlanID) } func testAccCheckIBMContainerCluster_diskEnc(clusterName string) string { diff --git a/vendor/github.com/IBM-Cloud/bluemix-go/api/container/containerv1/api_service.go b/vendor/github.com/IBM-Cloud/bluemix-go/api/container/containerv1/api_service.go index 51e1db8b1d3..3e3f7b0d0a0 100644 --- a/vendor/github.com/IBM-Cloud/bluemix-go/api/container/containerv1/api_service.go +++ b/vendor/github.com/IBM-Cloud/bluemix-go/api/container/containerv1/api_service.go @@ -22,6 +22,7 @@ type ContainerServiceAPI interface { WebHooks() Webhooks Subnets() Subnets KubeVersions() KubeVersions + Vlans() Vlans } //ContainerService holds the client @@ -96,3 +97,8 @@ func (c *csService) WebHooks() Webhooks { func (c *csService) KubeVersions() KubeVersions { return newKubeVersionAPI(c.Client) } + +//Vlans implements DC Cluster Vlan API +func (c *csService) Vlans() Vlans { + return newVlanAPI(c.Client) +} diff --git a/vendor/github.com/IBM-Cloud/bluemix-go/api/container/containerv1/clusters.go b/vendor/github.com/IBM-Cloud/bluemix-go/api/container/containerv1/clusters.go index 0ace1c0e571..41fb866f4be 100644 --- a/vendor/github.com/IBM-Cloud/bluemix-go/api/container/containerv1/clusters.go +++ b/vendor/github.com/IBM-Cloud/bluemix-go/api/container/containerv1/clusters.go @@ -76,10 +76,9 @@ type ClusterTargetHeader struct { } const ( - orgIDHeader = "X-Auth-Resource-Org" - spaceIDHeader = "X-Auth-Resource-Space" - accountIDHeader = "X-Auth-Resource-Account" - + orgIDHeader = "X-Auth-Resource-Org" + spaceIDHeader = "X-Auth-Resource-Space" + accountIDHeader = "X-Auth-Resource-Account" slUserNameHeader = "X-Auth-Softlayer-Username" slAPIKeyHeader = "X-Auth-Softlayer-APIKey" ) diff --git a/vendor/github.com/IBM-Cloud/bluemix-go/api/container/containerv1/properties.go b/vendor/github.com/IBM-Cloud/bluemix-go/api/container/containerv1/properties.go new file mode 100644 index 00000000000..f23718fb81c --- /dev/null +++ b/vendor/github.com/IBM-Cloud/bluemix-go/api/container/containerv1/properties.go @@ -0,0 +1,53 @@ +package containerv1 + +import ( + "fmt" + + "github.com/IBM-Cloud/bluemix-go/client" +) + +//Vlan ... +type DCVlan struct { + ID string `json:"id"` + Properties DCVlanProperties `json:"properties"` + Type string `json:"type"` +} + +//VlanProperties ... +type DCVlanProperties struct { + LocalDiskStorageCapability string `json:"local_disk_storage_capability"` + Location string `json:"location"` + Name string `json:"name"` + Note string `json:"note"` + PrimaryRouter string `json:"primary_router"` + SANStorageCapability string `json:"san_storage_capability"` + VlanNumber string `json:"vlan_number"` + VlanType string `json:"vlan_type"` +} + +//Subnets interface +type Vlans interface { + List(string) ([]DCVlan, error) +} + +type vlan struct { + client *client.Client +} + +func newVlanAPI(c *client.Client) Vlans { + return &vlan{ + client: c, + } +} + +//GetVlans ... +func (r *vlan) List(datacenter string) ([]DCVlan, error) { + vlans := []DCVlan{} + rawURL := fmt.Sprintf("/v1/datacenters/%s/vlans", datacenter) + _, err := r.client.Get(rawURL, &vlans) + if err != nil { + return nil, err + } + + return vlans, err +} diff --git a/vendor/github.com/IBM-Cloud/bluemix-go/endpoints/endpoints.go b/vendor/github.com/IBM-Cloud/bluemix-go/endpoints/endpoints.go index a8f385e0eff..465bb60da93 100644 --- a/vendor/github.com/IBM-Cloud/bluemix-go/endpoints/endpoints.go +++ b/vendor/github.com/IBM-Cloud/bluemix-go/endpoints/endpoints.go @@ -47,6 +47,7 @@ var regionToEndpoint = map[string]map[string]string{ "eu-gb": "https://iam.bluemix.net", "au-syd": "https://iam.bluemix.net", "eu-de": "https://iam.bluemix.net", + "jp-tok": "https://iam.bluemix.net", }, "iampap": { "us-south": "https://iam.bluemix.net", @@ -54,6 +55,7 @@ var regionToEndpoint = map[string]map[string]string{ "eu-gb": "https://iam.bluemix.net", "au-syd": "https://iam.bluemix.net", "eu-de": "https://iam.bluemix.net", + "jp-tok": "https://iam.bluemix.net", }, "uaa": { "us-south": "https://login.ng.bluemix.net/UAALoginServerWAR", @@ -75,7 +77,9 @@ var regionToEndpoint = map[string]map[string]string{ "eu-de": "https://eu-central.containers.bluemix.net", "au-syd": "https://ap-south.containers.bluemix.net", "eu-gb": "https://uk-south.containers.bluemix.net", + "jp-tok": "https://ap-north.containers.bluemix.net", }, + "resource-manager": { "us-south": "https://resource-manager.bluemix.net", "us-east": "https://resource-manager.bluemix.net", diff --git a/vendor/github.com/IBM-Cloud/bluemix-go/examples/container/create/main.go b/vendor/github.com/IBM-Cloud/bluemix-go/examples/container/create/main.go index aab42e6e315..3a3f262242d 100644 --- a/vendor/github.com/IBM-Cloud/bluemix-go/examples/container/create/main.go +++ b/vendor/github.com/IBM-Cloud/bluemix-go/examples/container/create/main.go @@ -9,9 +9,7 @@ import ( bluemix "github.com/IBM-Cloud/bluemix-go" "github.com/IBM-Cloud/bluemix-go/session" - "github.com/IBM-Cloud/bluemix-go/api/account/accountv2" v1 "github.com/IBM-Cloud/bluemix-go/api/container/containerv1" - "github.com/IBM-Cloud/bluemix-go/api/mccp/mccpv2" "github.com/IBM-Cloud/bluemix-go/trace" ) @@ -43,9 +41,6 @@ func main() { var location string flag.StringVar(&location, "location", "", "location") - var region string - flag.StringVar(&c.Region, "region", "us-south", "The Bluemix region. You can source it from env BM_REGION or BLUEMIX_REGION") - var skipDeletion bool flag.BoolVar(&skipDeletion, "no-delete", false, "If provided will delete the resources created") @@ -72,42 +67,11 @@ func main() { log.Fatal(err) } - client, err := mccpv2.New(sess) - - if err != nil { - log.Fatal(err) - } - - region = sess.Config.Region - orgAPI := client.Organizations() - myorg, err := orgAPI.FindByName(org, region) - - if err != nil { - log.Fatal(err) - } - - spaceAPI := client.Spaces() - myspace, err := spaceAPI.FindByNameInOrg(myorg.GUID, space, region) - - if err != nil { - log.Fatal(err) - } - - accClient, err := accountv2.New(sess) - if err != nil { - log.Fatal(err) - } - accountAPI := accClient.Accounts() - myAccount, err := accountAPI.FindByOrg(myorg.GUID, region) if err != nil { log.Fatal(err) } - target := v1.ClusterTargetHeader{ - OrgID: myorg.GUID, - SpaceID: myspace.GUID, - AccountID: myAccount.GUID, - } + target := v1.ClusterTargetHeader{} clusterClient, err := v1.New(sess) if err != nil { diff --git a/vendor/vendor.json b/vendor/vendor.json index 189b558e45d..95053ccd074 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -9,302 +9,302 @@ { "checksumSHA1": "v7qhBc5UGS9zfPQ1nsoTbXFuqkM=", "path": "github.com/IBM-Cloud/bluemix-go", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "8SzzODbuwbITkGgPJeY+uWhBMdU=", "path": "github.com/IBM-Cloud/bluemix-go/api/account/accountv1", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "W7I/CU3LzJ2GNKfmTdp5SXS4MeI=", "path": "github.com/IBM-Cloud/bluemix-go/api/account/accountv2", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { - "checksumSHA1": "5DFvsAKbrBOwNGI8O20oVUf6Fkg=", + "checksumSHA1": "+Gy5zF6ZGVuJ2GaTfrEfqhLOG0E=", "path": "github.com/IBM-Cloud/bluemix-go/api/container/containerv1", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "9QGo6dO761kNjS0TI1qsfUjSelU=", "path": "github.com/IBM-Cloud/bluemix-go/api/iam/iamv1", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "uu3NdgFzbaUGFXlZKwjQmvepGbQ=", "path": "github.com/IBM-Cloud/bluemix-go/api/iampap/iampapv1", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "rDQaxiIJVbgi7WcWMgXDIZKmU3Y=", "path": "github.com/IBM-Cloud/bluemix-go/api/mccp/mccpv2", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "y12lwJlVgidIV72atdyfn35SeH4=", "path": "github.com/IBM-Cloud/bluemix-go/api/resource/resourcev1/catalog", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "kJcScEF96qoZI3lvUwJRC4Jxviw=", "path": "github.com/IBM-Cloud/bluemix-go/api/resource/resourcev1/controller", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "jI5/PPnq4F4xdI4umLW2F+SSE3A=", "path": "github.com/IBM-Cloud/bluemix-go/api/resource/resourcev1/management", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "jb8XcPW2n788WPhO8BCZyMQQbGY=", "path": "github.com/IBM-Cloud/bluemix-go/authentication", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "Lk3K4JXThQCNWZi7kduEP2ZQijs=", "path": "github.com/IBM-Cloud/bluemix-go/bmxerror", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "zAGQHcZOEq5fQjiYyH5vRMeA4aI=", "path": "github.com/IBM-Cloud/bluemix-go/client", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "Y4yWijeccUf4+feLTOw5u36lfeY=", "path": "github.com/IBM-Cloud/bluemix-go/crn", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { - "checksumSHA1": "wulXGiee7+jd+Y1HK8yPToeQOrM=", + "checksumSHA1": "vcCU0vAGiQEPaD/gVKnU8lD2gy4=", "path": "github.com/IBM-Cloud/bluemix-go/endpoints", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "KUcbVeOgsWsF10BAmfm5X0EfywI=", "path": "github.com/IBM-Cloud/bluemix-go/examples/account/accountv1", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "cvKGqUR1nNGkyw1nY8MWrvpXdrM=", "path": "github.com/IBM-Cloud/bluemix-go/examples/account/accountv2", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "Uj7UnMsatyQArHZRNIzGN7dEWI0=", "path": "github.com/IBM-Cloud/bluemix-go/examples/container/bind_service", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { - "checksumSHA1": "NTTpveELqHAmcxf3R70KOXZketM=", + "checksumSHA1": "7VB+4mdO6WF+tdpV4xYNhs8Kb6Y=", "path": "github.com/IBM-Cloud/bluemix-go/examples/container/create", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "yEzUM3pOXIl4YFRDT3FTqKubyfg=", "path": "github.com/IBM-Cloud/bluemix-go/examples/container/custom_container_endpoint", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "s1afP+eOtwr9axMAlI+v1rrrg2c=", "path": "github.com/IBM-Cloud/bluemix-go/examples/container/download_config", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "R6I7UxjM9Tm5yh/a9cSZPfeGrtw=", "path": "github.com/IBM-Cloud/bluemix-go/examples/container/versions", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "IZc6WX0N75gGGsnCdhjrK5mTsdc=", "path": "github.com/IBM-Cloud/bluemix-go/examples/iam/service_id", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "u+AN45aE9q4Rnq8oWKnp/oJn4MI=", "path": "github.com/IBM-Cloud/bluemix-go/examples/iam/service_policy", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "oligjJDmFQ59HhHtb/vz2hWsji4=", "path": "github.com/IBM-Cloud/bluemix-go/examples/iam/service_roles", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "72Pu+bSyEtOG0VspUcgjA1E7nBk=", "path": "github.com/IBM-Cloud/bluemix-go/examples/iam/user_policy", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "SsmDifv0g4XUa6ktPc58WQCL3GM=", "path": "github.com/IBM-Cloud/bluemix-go/examples/iam_pap/iampapv1", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "oHjUrDKjNRbuvLzdmRG03tmAxDw=", "path": "github.com/IBM-Cloud/bluemix-go/examples/mccp/app", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "vIpi+dlfT/ywdHlWZ/H3tiIgrZE=", "path": "github.com/IBM-Cloud/bluemix-go/examples/mccp/organization", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "AqRgVKlsxGoez7i3230wM3i2k+E=", "path": "github.com/IBM-Cloud/bluemix-go/examples/mccp/orgquota", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "4EiYYCeA+x6QsROVhdoDa5ezsjk=", "path": "github.com/IBM-Cloud/bluemix-go/examples/mccp/privatedomain", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "n1xvZogsCrcjY7LA6DngO6vv0us=", "path": "github.com/IBM-Cloud/bluemix-go/examples/mccp/region", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "1RahaNbd+9iYHnzKLG7+2NUuwzU=", "path": "github.com/IBM-Cloud/bluemix-go/examples/mccp/route", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "9tTBLnXmzwoXjMjMAHc2RgFxGis=", "path": "github.com/IBM-Cloud/bluemix-go/examples/mccp/service", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "7L5IJGnE5NKAwkpbW+xIvj2cctc=", "path": "github.com/IBM-Cloud/bluemix-go/examples/mccp/shareddomain", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "MQoCdLzu4p2pMOfnmHZZKkQyv5c=", "path": "github.com/IBM-Cloud/bluemix-go/examples/mccp/space", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "hjGPHJPLnwegJLRDH4CRKeAyfr0=", "path": "github.com/IBM-Cloud/bluemix-go/examples/mccp/spacequota", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "TRhouhKKuInO4swvTDCoQBwV38c=", "path": "github.com/IBM-Cloud/bluemix-go/examples/resource/catalog", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "lsCPj2Qmq3+P1wY3lHyCYh8mavs=", "path": "github.com/IBM-Cloud/bluemix-go/examples/resource/controller/service-alias", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "YiJ4eJfqAsZjfN6OU20YUk62xzo=", "path": "github.com/IBM-Cloud/bluemix-go/examples/resource/controller/service-instance", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "C5ufkDTVciVZD5+hwsS/52xyI1s=", "path": "github.com/IBM-Cloud/bluemix-go/examples/resource/controller/service-key", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "I11D7W0PbLHFyWq5WX7psaUFx9Y=", "path": "github.com/IBM-Cloud/bluemix-go/examples/resource/management/group", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "s9LWbhltAoCed6z7xG85ksI3avE=", "path": "github.com/IBM-Cloud/bluemix-go/examples/resource/management/quota", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "mjI/ksgVkmiZEaW0z/AVDYWNZIw=", "path": "github.com/IBM-Cloud/bluemix-go/helpers", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "YpQ7UPuU/BUeyZVRae/wcmk+Yic=", "path": "github.com/IBM-Cloud/bluemix-go/http", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "ueFTbo8qbmA1BzeEhO7M/bmjoZY=", "path": "github.com/IBM-Cloud/bluemix-go/models", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "xoh3qlnwxGTGO4/3Z+/mpnfI3RM=", "path": "github.com/IBM-Cloud/bluemix-go/rest", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "2tKYgnU+D69LPR2Z11aHox+izzU=", "path": "github.com/IBM-Cloud/bluemix-go/session", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "Kb2lHrHnA8QcB2LeindsqW7qja0=", "path": "github.com/IBM-Cloud/bluemix-go/trace", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "5Ohwav4WKkc1AjqQWX0+0hOlVmE=", "path": "github.com/IBM-Cloud/bluemix-go/utils", - "revision": "00b345fa91ae8faa596c29f827f762bd5721b1b7", - "revisionTime": "2018-06-27T08:09:58Z" + "revision": "89f8ea3b999179b9241aa30fbf02c94b2c784ab3", + "revisionTime": "2018-07-02T10:17:30Z" }, { "checksumSHA1": "jQh1fnoKPKMURvKkpdRjN695nAQ=", diff --git a/website/docs/d/container_cluster.html.markdown b/website/docs/d/container_cluster.html.markdown index 4230e3be581..4965aed84c0 100644 --- a/website/docs/d/container_cluster.html.markdown +++ b/website/docs/d/container_cluster.html.markdown @@ -30,7 +30,7 @@ The following arguments are supported: * `cluster_name_id` - (Required, string) The name or ID of the cluster. * `org_guid` - (Optional, string) The GUID for the IBM Cloud organization associated with the cluster. You can retrieve the value from the `ibm_org` data source or by running the `bx iam orgs --guid` command in the [IBM Cloud CLI](https://console.bluemix.net/docs/cli/reference/bluemix_cli/get_started.html#getting-started). * `space_guid` - (Optional, string) The GUID for the IBM Cloud space associated with the cluster. You can retrieve the value from the `ibm_space` data source or by running the `bx iam space --guid` command in the IBM Cloud CLI. -* `account_guid` - (Required, string) The GUID for the IBM Cloud account associated with the cluster. You can retrieve the value from the `ibm_account` data source or by running the `bx iam accounts` command in the IBM Cloud CLI. +* `account_guid` - (Optional, string) The GUID for the IBM Cloud account associated with the cluster. You can retrieve the value from the `ibm_account` data source or by running the `bx iam accounts` command in the IBM Cloud CLI. ## Attribute Reference diff --git a/website/docs/d/container_cluster_config.html.markdown b/website/docs/d/container_cluster_config.html.markdown index f0980ae5a27..84a52e49cb4 100644 --- a/website/docs/d/container_cluster_config.html.markdown +++ b/website/docs/d/container_cluster_config.html.markdown @@ -34,7 +34,7 @@ The following arguments are supported: * `download` - (Optional, boolean) Set the value to `false` to skip downloading the configuration for the administrator. The default value is `true`. Because it is part of a data source, by default the configuration is downloaded for every Terraform call. For a particular cluster name or ID, the configuration is guaranteed to be downloaded to the same path for a given `config_dir`. * `org_guid` - (Optional, string) The GUID for the IBM Cloud organization associated with the cluster. You can retrieve the value from the `ibm_org` data source or by running the `bx iam orgs --guid` command in the [IBM Cloud CLI](https://console.bluemix.net/docs/cli/reference/bluemix_cli/get_started.html#getting-started). * `space_guid` - (Optional, string) The GUID for the IBM Cloud space associated with the cluster. You can retrieve the value from the `ibm_space` data source or by running the `bx iam space --guid` command in the IBM Cloud CLI. -* `account_guid` - (Required, string) The GUID for the IBM Cloud account associated with the cluster. You can retrieve the value from the `ibm_account` data source or by running the `bx iam accounts` command in the IBM Cloud CLI. +* `account_guid` - (Optional, string) The GUID for the IBM Cloud account associated with the cluster. You can retrieve the value from the `ibm_account` data source or by running the `bx iam accounts` command in the IBM Cloud CLI. ## Attribute Reference diff --git a/website/docs/d/container_cluster_versions.html.markdown b/website/docs/d/container_cluster_versions.html.markdown index 988eb66fe7d..7dcb58f093c 100644 --- a/website/docs/d/container_cluster_versions.html.markdown +++ b/website/docs/d/container_cluster_versions.html.markdown @@ -26,7 +26,7 @@ The following arguments are supported: * `org_guid` - (Optional, string) The GUID for the IBM Cloud organization associated with the cluster. You can retrieve the value from the `ibm_org` data source or by running the `bx iam orgs --guid` command in the [IBM Cloud CLI](https://console.bluemix.net/docs/cli/reference/bluemix_cli/get_started.html#getting-started). * `space_guid` - (Optional, string) The GUID for the IBM Cloud space associated with the cluster. You can retrieve the value from the `ibm_space` data source or by running the `bx iam space --guid` command in the IBM Cloud CLI. -* `account_guid` - (Required, string) The GUID for the IBM Cloud account associated with the cluster. You can retrieve the value from the `ibm_account` data source or by running the `bx iam accounts` command in the IBM Cloud CLI. +* `account_guid` - (Optional, string) The GUID for the IBM Cloud account associated with the cluster. You can retrieve the value from the `ibm_account` data source or by running the `bx iam accounts` command in the IBM Cloud CLI. ## Attribute Reference diff --git a/website/docs/d/container_cluster_worker.html.markdown b/website/docs/d/container_cluster_worker.html.markdown index cc29c0aec5f..76b2b9d5f7f 100644 --- a/website/docs/d/container_cluster_worker.html.markdown +++ b/website/docs/d/container_cluster_worker.html.markdown @@ -30,7 +30,7 @@ The following arguments are supported: * `worker_id` - (Required, string) The ID of the worker node attached to the cluster. * `org_guid` - (Optional, string) The GUID for the IBM Cloud organization that the cluster is associated with. You can retrieve the value from the `ibm_org` data source or by running the `bx iam orgs --guid` command in the [IBM Cloud CLI](https://console.bluemix.net/docs/cli/reference/bluemix_cli/get_started.html#getting-started). * `space_guid` - (Optional, string) The GUID for the IBM Cloud space that the cluster is associated with. You can retrieve the value from the `ibm_space` data source or by running the `bx iam space --guid` command in the IBM Cloud CLI. -* `account_guid` - (Required, string) The GUID for the IBM Cloud account that the cluster is associated with. You can retrieve the value from the `ibm_account` data source or by running the `bx iam accounts` command in the IBM Cloud CLI. +* `account_guid` - (Optional, string) The GUID for the IBM Cloud account that the cluster is associated with. You can retrieve the value from the `ibm_account` data source or by running the `bx iam accounts` command in the IBM Cloud CLI. ## Attribute Reference diff --git a/website/docs/r/container_bind_service.html.markdown b/website/docs/r/container_bind_service.html.markdown index 97527e4b8ed..96025c7b4b5 100644 --- a/website/docs/r/container_bind_service.html.markdown +++ b/website/docs/r/container_bind_service.html.markdown @@ -37,7 +37,7 @@ The following arguments are supported: * `service_instance_id` - (Optional, string) The ID of the service that you want to bind to the cluster. Conflicts with `service_instance_name`. * `org_guid` - (Optional, string) The GUID for the IBM Cloud organization associated with the cluster. You can retrieve the value from data source `ibm_org` or by running the `bx iam orgs --guid` command in the [IBM Cloud CLI](https://console.bluemix.net/docs/cli/reference/bluemix_cli/get_started.html#getting-started). * `space_guid` - (Optional, string) The GUID for the IBM Cloud space associated with the cluster. You can retrieve the value from data source `ibm_space` or by running the `bx iam space --guid` command in the IBM Cloud CLI. -* `account_guid` - (Required, string) The GUID for the IBM Cloud account associated with the cluster. You can retrieve the value from data source `ibm_account` or by running the `bx iam accounts` command in the IBM Cloud CLI. +* `account_guid` - (Optional, string) The GUID for the IBM Cloud account associated with the cluster. You can retrieve the value from data source `ibm_account` or by running the `bx iam accounts` command in the IBM Cloud CLI. * `tags` - (Optional, array of strings) Tags associated with the container bind service instance. **NOTE**: `Tags` are managed locally and not stored on the IBM Cloud service endpoint at this moment. diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown index 84515b61301..e3e7d61fd81 100644 --- a/website/docs/r/container_cluster.html.markdown +++ b/website/docs/r/container_cluster.html.markdown @@ -74,7 +74,7 @@ The following arguments are supported: * `kube_version` - (Optional, string) The desired Kubernetes version of the created cluster. If present, at least major.minor must be specified. * `org_guid` - (Optional, string) The GUID for the IBM Cloud organization associated with the cluster. You can retrieve the value from data source `ibm_org` or by running the `bx iam orgs --guid` command in the IBM Cloud CLI. * `space_guid` - (Optional, string) The GUID for the IBM Cloud space associated with the cluster. You can retrieve the value from data source `ibm_space` or by running the `bx iam space --guid` command in the IBM Cloud CLI. -* `account_guid` - (Required, string) The GUID for the IBM Cloud account associated with the cluster. You can retrieve the value from data source `ibm_account` or by running the `bx iam accounts` command in the IBM Cloud CLI. +* `account_guid` - (Optional, string) The GUID for the IBM Cloud account associated with the cluster. You can retrieve the value from data source `ibm_account` or by running the `bx iam accounts` command in the IBM Cloud CLI. * `workers` - (Deprecated) The worker nodes that you want to add to the cluster. Nested `workers` blocks have the following structure: * `action` - valid actions are add, reboot and reload. * `name` - Name of the worker.