add resource cce addon #484
Conversation
|
@Jason-Zhang9309 Need to add website docs |
| if err != nil { | ||
| return fmt.Errorf("Unable to create HuaweiCloud CCE client : %s", err) | ||
| } | ||
| authenticating_proxy := make(map[string]string) |
There was a problem hiding this comment.
seems this is unneeded, I don't find it is used anywhere.
| }, | ||
| } | ||
|
|
||
| create, err := addons.Create(cceClient, createOpts, d.Get("cluster_id").(string)).Extract() |
There was a problem hiding this comment.
better to define a cluster_id variable to save d.Get('cluster_id').(string). Seems we use it multi times.
| log.Printf("[DEBUG] Waiting for HuaweiCloud CCEAddon (%s) to become available", create.Metadata.Id) | ||
|
|
||
| stateConf := &resource.StateChangeConf{ | ||
| Pending: []string{"installing", "abnormal"}, |
There was a problem hiding this comment.
abnormal should not be Pending state.
There was a problem hiding this comment.
While creating addon instance, the status could be "abnormal" for a moment before it becomes "running"
|
|
||
| d.Set("name", n.Metadata.Name) | ||
| d.Set("status", n.Status.Status) | ||
| d.Set("region", GetRegion(d, config)) |
| return fmt.Errorf("Error retrieving HuaweiCloud CCEAddon: %s", err) | ||
| } | ||
|
|
||
| d.Set("name", n.Metadata.Name) |
There was a problem hiding this comment.
Should also set the arguments from response, not only attributes.
| Config: testAccCCEAddonV3_basic(rName), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckCCEAddonV3Exists(resourceName, clusterName, &addon), | ||
| //resource.TestCheckResourceAttr(resourceName, "name", rName), |
There was a problem hiding this comment.
should not leave comment line here, remove it or remove //
|
|
||
| # huaweicloud\_cce\_addon | ||
| Add an addon to a container cluster. | ||
| This is an alternative to `huaweicloud_cce_addon` |
|
|
||
| * `name` - Addon instance name. | ||
|
|
||
| * `region` - The regin of cluster. |
| }, | ||
|
|
||
| Schema: map[string]*schema.Schema{ // request and response parameters | ||
| "authenticating_proxy_ca": { |
| Read: resourceCCEAddonV3Read, | ||
| Delete: resourceCCEAddonV3Delete, | ||
| Importer: &schema.ResourceImporter{ | ||
| State: schema.ImportStatePassthrough, |
There was a problem hiding this comment.
as we need two parameters: addon id and cluster id, so we can not import the resource directly.
| Required: true, | ||
| ForceNew: true, | ||
| }, | ||
| "name": { |
There was a problem hiding this comment.
what's the difference between name and addon_template_name ?
There was a problem hiding this comment.
The name can't be set in CreateOpts, and it can't be known until the creating of instance complete. As for the values of these two parameters，they are actually the same because only one instance can be created in a cluster for each addon template.
There was a problem hiding this comment.
name seems unneeded, we can just get rid of it.
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "status": { |
There was a problem hiding this comment.
seems we can add more attributes, e.g. type, description and values.
| if err != nil { | ||
| return fmt.Errorf("Error creating HuaweiCloud CCEAddon: %s", err) | ||
| } | ||
| d.SetId(create.Metadata.Id) |
There was a problem hiding this comment.
do SetId before waiting the state, as the resource had been created.
| cluster_id = huaweicloud_cce_cluster_v3.test.id | ||
| name = "%s" | ||
| flavor_id = "s6.large.2" | ||
| availability_zone = data.huaweicloud_availability_zones.test.names[0] | ||
| key_pair = huaweicloud_compute_keypair_v2.test.name |
There was a problem hiding this comment.
if the dependent resource name has changed in the base, it will cause an error
Jason-Zhang9309
force-pushed
the
dev
branch
3 times, most recently
from
dbd0139 to
7301634
Compare
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| "api_version": { |
There was a problem hiding this comment.
kind and api_version seems unneeded.
There was a problem hiding this comment.
they are fixed to Addon and v3
Jason-Zhang9309
force-pushed
the
dev
branch
3 times, most recently
from
59b1f7e to
25593e2
Compare
|
|
||
| create, err := addons.Create(cceClient, createOpts, cluster_id).Extract() | ||
|
|
||
| d.SetId(create.Metadata.Id) |
There was a problem hiding this comment.
move this to L89, should only set when there is no error.
| stateConf := &resource.StateChangeConf{ | ||
| Pending: []string{"Deleting", "Available", "Unavailable"}, | ||
| Target: []string{"Deleted"}, | ||
| Refresh: waitForCCEAddonDelete(cceClient, d.Id(), d.Get("cluster_id").(string)), |
There was a problem hiding this comment.
use cluster_id directly here
make testacc TEST='./huaweicloud' TESTARGS='-run TestAccCCEAddonV3_basic'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./huaweicloud -v -run TestAccCCEAddonV3_basic -timeout 360m
=== RUN TestAccCCEAddonV3_basic
--- PASS: TestAccCCEAddonV3_basic (710.97s)
PASS
ok github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud 711.017s