Add SCM certificate management support #1218

chengxiangdong · 2021-06-18T09:46:55Z

What this PR does / why we need it:
fixes #1179

Which issue this PR fixes:
NONE

Special notes for your reviewer:

Release note:

NONE

PR Checklist

Tests added/passed.
Documentation updated.
Schema updated.

Acceptance Steps Performed

make testacc TEST='./huaweicloud' TESTARGS='-run TestScmCertificationV3_basic'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./huaweicloud -v -run TestScmCertificationV3_basic -timeout 360m -parallel 4
=== RUN TestScmCertificationV3_basic
=== PAUSE TestScmCertificationV3_basic
=== CONT TestScmCertificationV3_basic
--- PASS: TestScmCertificationV3_basic (18.96s)
PASS
ok github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud 19.075s

make testacc TEST='./huaweicloud' TESTARGS='-run TestScloud' TESTARGS='-run TestScmCertificationPushV3'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./huaweicloud -v -run TestScmCertificationPushV3 -timeout 360m -parallel 4
=== RUN TestScmCertificationPushV3_basic
=== PAUSE TestScmCertificationPushV3_basic
=== CONT TestScmCertificationPushV3_basic
--- PASS: TestScmCertificationPushV3_basic (8.38s)
PASS
ok github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud 8.472s

make testacc TEST='./huaweicloud' TESTARGS='-run TestAccScmCertificationV3_push'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./huaweicloud -v -run TestAccScmCertificationV3_push -timeout 360m -parallel 4
=== RUN TestAccScmCertificationV3_push
=== PAUSE TestAccScmCertificationV3_push
=== CONT TestAccScmCertificationV3_push
--- PASS: TestAccScmCertificationV3_push (22.18s)
PASS
ok github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud 22.250s

make testacc TEST='./huaweicloud' TESTARGS='-run TestAccScmCertificationV3_batchPush'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./huaweicloud -v -run TestAccScmCertificationV3_batchPush -timeout 360m -parallel 4
=== RUN TestAccScmCertificationV3_batchPush
=== PAUSE TestAccScmCertificationV3_batchPush
=== CONT TestAccScmCertificationV3_batchPush
--- PASS: TestAccScmCertificationV3_batchPush (11.35s)
PASS
ok github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud 11.442s

…vider-huaweicloud into dev

…tificate_push(huaweicloud#1179)

# Conflicts: # go.mod # go.sum # vendor/modules.txt

…ud#1179)

…aweicloud#1179)

…1179)

niuzhenguo · 2021-06-22T12:14:30Z

docs/resources/scm_certificate.md

+
+The following arguments are supported:
+
+* `region` - (Optional, String, ForceNew) The region in which to create the ELB certificate resource.


s/ELB certificate/SCM certificate

niuzhenguo · 2021-06-22T12:15:04Z

docs/resources/scm_certificate.md

+
+```hcl
+# Load the certificate contents from the local files.
+resource "huaweicloud_scm_certificate" "certificate_2" {


Nits: better to use certificate_1 here and certificate_2 below :D

niuzhenguo · 2021-06-22T12:19:33Z

huaweicloud/provider_test.go

+	}
+	if HW_CERTIFICATE_PRIVATE_KEY_PATH == "" {
+		t.Skip("HW_CERTIFICATE_PRIVATE_KEY_PATH must be set for BMS certificate tests")
+	}


can be combined to one if, if HW_CERTIFICATE_PATH == "" || if HW...

niuzhenguo · 2021-06-22T12:23:35Z

huaweicloud/resource_huaweicloud_scm_certificate_v3.go

+		}
+	}
+
+	//return fmt.Errorf("Error creating HuaweiCloud SCM client") //


this line should be removed.

ShiChangkuo · 2021-06-22T12:24:34Z

docs/resources/scm_certificate.md

+subcategory: "SSL Certificate Manager (SCM)"
+---
+
+# huaweicloud\_scm\_certificate


\ is unnecessary

has removed

ShiChangkuo · 2021-06-22T12:26:24Z

docs/resources/scm_certificate.md

+## Example Usage
+
+```hcl
+# Load the certificate contents from the local files.


### Load the certificate contents from the local files

```hcl

the sample description has been reorganized

ShiChangkuo · 2021-06-22T12:27:55Z

docs/resources/scm_certificate.md

+  private_key       = file("/usr/local/data/certificate/cert_xxx/xxx_server.key")
+}
+
+# Write the contents of the certificate into the Terrafrom script.


ShiChangkuo · 2021-06-22T12:31:26Z

docs/resources/scm_certificate.md

+- `update` - Default is 10 minute.
+- `delete` - Default is 5 minute.
+
+## Error Codes


this section is unnecessary

has removed

ShiChangkuo · 2021-06-22T12:40:21Z

huaweicloud/config/endpoints.go

+		Name:             "scm",
+		Version:          "v3",
+		WithOutProjectID: true,
+	},


should add the testing in endpoints_test.go

It was omitted and has been added now.

ShiChangkuo · 2021-06-23T02:23:37Z

huaweicloud/resource_huaweicloud_scm_certificate_v3.go

+				ForceNew:         true,
+				DiffSuppressFunc: utils.SuppressNewLineDiffs,
+			},
+			"push_certificate": {


suggest name as:
target {
service = "xxx"
project = ["aaa", "bbb"]
}

ShiChangkuo · 2021-06-23T02:25:07Z

huaweicloud/resource_huaweicloud_scm_certificate_v3.go

+
+func resourceScmCertificateV3Create(d *schema.ResourceData, meta interface{}) error {
+	config := meta.(*config.Config)
+	elbClient, err := config.ScmV3Client(GetRegion(d, config))


the name of client is misleading

has renamed

ShiChangkuo · 2021-06-23T02:36:42Z

huaweicloud/resource_huaweicloud_scm_certificate_v3.go

+	config := meta.(*config.Config)
+	elbClient, err := config.ScmV3Client(GetRegion(d, config))
+
+	oldVal, newVal := d.GetChange("push_certificate")


suggest to define it as schema.Set, then we can use Difference method to get the new target

some logic has been updated.

ShiChangkuo · 2021-06-23T02:42:20Z

huaweicloud/resource_huaweicloud_scm_certificate_v3_test.go

+
+	rName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5))
+	targetService := "Enhance_ELB"
+	defaultTargetProject := "ap-southeast-1"


hard coding is not recommend, please use HW_DEST_PROJECT environment variable.

In order to be consistent with other variables, use: HW_CERTIFICATE_TARGET_SERVICE, HW_CERTIFICATE_TARGET_PROJECT and HW_CERTIFICATE_TARGET_PROJECT_UPDATE instead.

… attrubite.

ShiChangkuo · 2021-06-24T02:49:54Z

docs/resources/scm_certificate.md

+    It can be extracted from the _server.crt_ file in the Nginx directory, 
+    usually after the second paragraph is the certificate chain.
+* `private_key` - (Required, String, ForceNew) The private encrypted key of the Certificate, PEM format.
+* `target` - (Optional, List) The service to which the certificate needs to be pushed.The push_certificate


still using push_certificate in the description.

ShiChangkuo · 2021-06-24T02:50:40Z

docs/resources/scm_certificate.md

+* `service` - (Required, String) Service to which the certificate is pushed.
+  The options include `CDN`,`WAF` and `Enhance_ELB`.
+* `project` - (Optional, String) The project where the service you want to push a certificate to.
+  The same certificate can be pushed repeatedly to the same WAF or ELB service in the same `target_project`,


still using target_project in the description.

ShiChangkuo · 2021-06-24T06:27:46Z

huaweicloud/resource_huaweicloud_scm_certificate_v3.go

+			log.Printf("[DEBUG] Find new services and start to push. %#v", pushOpts)
+			err := doPushCertificateToService(d.Id(), pushOpts, scmClient)
+			if err != nil {
+				d.SetId("")


we can not set the ID to null in Update method, just return the error.

If id is not set to blank, the data will be saved to the state file. The change cannot be recognized when executed again.
To be safe, I overwrite the target with the old value.

…lue.

…lue.(huaweicloud#1179)

ChengXiangdong and others added 30 commits June 9, 2021 14:38

Add urn and version attributes to fgs_function

5d29f76

Add urn and version attributes to fgs_function(huaweicloud#1182)

5e23419

Merge branch 'master' into dev

7ec6afb

Strengthen the "resource Fg Function Urn"

bba0364

fix: use TestCheckResourceAttrSet to check the attribute is not null

ff5436c

Add the function of certificate escrow.

681e026

Add the function of pushing certificate

b8eed9d

Add the function of certificate escrow and pushing

dbf75d6

Merge branch 'master' of https://github.com/huaweicloud/terraform-pro…

19def60

…vider-huaweicloud into dev

update golandsdk

ef2506f

update golandsdk

16397ad

update golandsdk

76d312b

Add SCM certificate management support huaweicloud#1218

e15952b

convert the type of 'certDetail.Authentifications' to TypeList

b64f861

Add the huaweicloud_scm_certificate document(huaweicloud#1179)

8a7556f

remove the first empty line of example usage

89aabd9

Add validation for the argument of target_project

4c5ea24

add error codes and solution link

a0e6a7c

Add the huaweicloud_scm_certificate_push document(huaweicloud#1179)

c476262

Rename the function to make the name more accurate

0a1beca

Add unit test for huaweicloud_scm_certificate and huaweicloud_scm_cer…

42d938b

…tificate_push(huaweicloud#1179)

Add unit test for huaweicloud_scm_certificate and huaweicloud_scm_cer…

aa88bf4

…tificate_push(huaweicloud#1179)

Merge branch 'master' into dev

a1fd795

Merge branch 'master' into dev

bc62154

# Conflicts: # go.mod # go.sum # vendor/modules.txt

Merge remote-tracking branch 'origin/dev' into dev

08d793d

update golangsdk for scm certification manager

d9bcab4

update golangsdk for scm certification manager

dddb87b

Fix: No need to parse the body returned by the push service(huaweiclo…

214c13d

…ud#1179)

Normalized the test function name

386666b

huaweicloud_scm_certificate adds support for pushing certificates.(hu…

5c636e3

…aweicloud#1179)

chengxiangdong added 6 commits June 22, 2021 17:21

huaweicloud_scm_certificate adds support for pushing certificates.(hu…

93f7a0e

…aweicloud#1179)

huaweicloud_scm_certificate adds support for pushing certificates.(hu…

5b34f9b

…aweicloud#1179)

Move pushing certificate to huaweicloud_scm_certificate.(huaweicloud#…

3545973

…1179)

Move pushing certificate to huaweicloud_scm_certificate.(huaweicloud#…

b7d0774

…1179)

Added description for push service.(huaweicloud#1179)

ef6b302

Move pushing certificate to huaweicloud_scm_certificate.(huaweicloud#…

66c16f3

…1179)

niuzhenguo reviewed Jun 22, 2021

View reviewed changes

chengxiangdong added 4 commits June 22, 2021 20:28

Name the certificate in order.

64d4fe3

Fixed some review suggestions

4f2c2a2

Fixed some review suggestions

65b9db8

Fixed some review suggestions

0ee475b

ShiChangkuo reviewed Jun 23, 2021

View reviewed changes

chengxiangdong added 11 commits June 23, 2021 11:08

add unit test from scm client in TestAccServiceEndpoints_Security

199e309

add env variables fro SCM

f59a7e9

modify the parameter name.

e8d26ab

modify the parameter name.

8ef2afa

Fixed some review suggestions

d74f591

fixed: Optimize the update function logic and remove some unnecessary…

a8782ad

… attrubite.

fixes the line separators(huaweicloud#1179)

54028b7

fixes the line separators(huaweicloud#1179)

22ff859

fixes the line separators(huaweicloud#1179)

7cf6ea9

fixed: remove some unnecessary attrubite.

b2b5547

fixed: remove some unnecessary attrubite.

6e13903

ShiChangkuo reviewed Jun 24, 2021

View reviewed changes

chengxiangdong added 3 commits June 24, 2021 15:14

fixes the parameter name.

e016f25

fixed: do not set id to blank, overwrite the target with the old va…

876a6cb

…lue.

fixed: do not set id to blank, overwrite the target with the old va…

5d3361d

…lue.(huaweicloud#1179)

ShiChangkuo merged commit 172a067 into huaweicloud:master Jun 24, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add SCM certificate management support #1218

Add SCM certificate management support #1218

chengxiangdong commented Jun 18, 2021 •

edited

Loading

niuzhenguo Jun 22, 2021

chengxiangdong Jun 22, 2021

niuzhenguo Jun 22, 2021

chengxiangdong Jun 22, 2021

niuzhenguo Jun 22, 2021

chengxiangdong Jun 23, 2021

niuzhenguo Jun 22, 2021

chengxiangdong Jun 22, 2021

ShiChangkuo Jun 22, 2021

chengxiangdong Jun 23, 2021

ShiChangkuo Jun 22, 2021

chengxiangdong Jun 23, 2021

ShiChangkuo Jun 22, 2021

chengxiangdong Jun 23, 2021

ShiChangkuo Jun 22, 2021

chengxiangdong Jun 23, 2021

ShiChangkuo Jun 22, 2021

chengxiangdong Jun 23, 2021

ShiChangkuo Jun 23, 2021

chengxiangdong Jun 23, 2021

ShiChangkuo Jun 23, 2021

chengxiangdong Jun 23, 2021

ShiChangkuo Jun 23, 2021

chengxiangdong Jun 23, 2021

ShiChangkuo Jun 23, 2021

chengxiangdong Jun 23, 2021 •

edited

Loading

ShiChangkuo Jun 24, 2021

chengxiangdong Jun 24, 2021

ShiChangkuo Jun 24, 2021

chengxiangdong Jun 24, 2021

ShiChangkuo Jun 24, 2021

chengxiangdong Jun 24, 2021


		The following arguments are supported:

		* `region` - (Optional, String, ForceNew) The region in which to create the ELB certificate resource.

Add SCM certificate management support #1218

Add SCM certificate management support #1218

Conversation

chengxiangdong commented Jun 18, 2021 • edited Loading

PR Checklist

Acceptance Steps Performed

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chengxiangdong Jun 23, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chengxiangdong commented Jun 18, 2021 •

edited

Loading

chengxiangdong Jun 23, 2021 •

edited

Loading