Skip to content

Commit a753b4b

Browse files
author
greyworld
committed
fix(apig/ssl_certificates): fix some issues
1 parent fe8d2ee commit a753b4b

File tree

3 files changed

+62
-60
lines changed

3 files changed

+62
-60
lines changed

‎docs/data-sources/apig_instance_associated_ssl_certificates.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Use this data source to get SSL certificate list associated with the specified i
1717
```hcl
1818
variable "instance_id" {}
1919
20-
data "huaweicloud_apig_instance_ssl_certificates" "test" {
20+
data "huaweicloud_apig_instance_associated_ssl_certificates" "test" {
2121
instance_id = var.instance_id
2222
}
2323
```
@@ -28,7 +28,7 @@ data "huaweicloud_apig_instance_ssl_certificates" "test" {
2828
variable "instance_id" {}
2929
variable "common_domain_name" {}
3030
31-
data "huaweicloud_apig_instance_ssl_certificates" "test" {
31+
data "huaweicloud_apig_instance_associated_ssl_certificates" "test" {
3232
instance_id = var.instance_id
3333
common_name = var.common_domain_name
3434
}
@@ -67,6 +67,8 @@ The `certificates` block supports:
6767

6868
* `instance_id` - The ID of the dedicated instance to which the SSL certificates belong.
6969

70+
* `project_id` - The ID of the region project to which the SSL certificates belong.
71+
7072
* `name` - The name of the SSL certificate.
7173

7274
* `type` - The type of the SSL certificate.

‎huaweicloud/provider.go

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -490,37 +490,37 @@ func Provider() *schema.Provider {
490490
"huaweicloud_aom_alarm_silence_rules": aom.DataSourceAlarmSilenceRules(),
491491
"huaweicloud_aom_service_discovery_rules": aom.DataSourceServiceDiscoveryRules(),
492492

493-
"huaweicloud_apig_acl_policies": apig.DataSourceAclPolicies(),
494-
"huaweicloud_apig_api_associated_acl_policies": apig.DataSourceApiAssociatedAclPolicies(),
495-
"huaweicloud_apig_api_associated_applications": apig.DataSourceApiAssociatedApplications(),
496-
"huaweicloud_apig_api_associated_plugins": apig.DataSourceApiAssociatedPlugins(),
497-
"huaweicloud_apig_api_associated_signatures": apig.DataSourceApiAssociatedSignatures(),
498-
"huaweicloud_apig_api_associated_throttling_policies": apig.DataSourceApiAssociatedThrottlingPolicies(),
499-
"huaweicloud_apig_api_basic_configurations": apig.DataSourceApiBasicConfigurations(),
500-
"huaweicloud_apig_api": apig.DataSourceApi(),
501-
"huaweicloud_apig_apis_tags": apig.DataSourceApisTags(),
502-
"huaweicloud_apig_appcodes": apig.DataSourceAppcodes(),
503-
"huaweicloud_apig_applications": apig.DataSourceApplications(),
504-
"huaweicloud_apig_availability_zones": apig.DataSourceAvailabilityZones(),
505-
"huaweicloud_apig_application_acl": apig.DataSourceApplicationAcl(),
506-
"huaweicloud_apig_application_quotas": apig.DataSourceApigApplicationQuotas(),
507-
"huaweicloud_apig_channels": apig.DataSourceChannels(),
508-
"huaweicloud_apig_custom_authorizers": apig.DataSourceCustomAuthorizers(),
509-
"huaweicloud_apig_endpoint_connections": apig.DataSourceApigEndpointConnections(),
510-
"huaweicloud_apig_environment_variables": apig.DataSourceApigEnvironmentVariables(),
511-
"huaweicloud_apig_environments": apig.DataSourceEnvironments(),
512-
"huaweicloud_apig_groups": apig.DataSourceGroups(),
513-
"huaweicloud_apig_instance_ssl_certificates": apig.DataSourceInstanceAssociatedSSLCertificates(),
514-
"huaweicloud_apig_instance_features": apig.DataSourceInstanceFeatures(),
515-
"huaweicloud_apig_instance_quotas": apig.DataSourceInstanceQuotas(),
516-
"huaweicloud_apig_instance_supported_features": apig.DataSourceInstanceSupportedFeatures(),
517-
"huaweicloud_apig_instances_filter": apig.DataSourceInstancesFilter(),
518-
"huaweicloud_apig_instances": apig.DataSourceInstances(),
519-
"huaweicloud_apig_orchestration_rules": apig.DataSourceOrchestrationRules(),
520-
"huaweicloud_apig_orchestration_rule_associated_apis": apig.DataSourceOrchestrationRuleAssociatedApis(),
521-
"huaweicloud_apig_plugins": apig.DataSourcePlugins(),
522-
"huaweicloud_apig_signatures": apig.DataSourceSignatures(),
523-
"huaweicloud_apig_throttling_policies": apig.DataSourceThrottlingPolicies(),
493+
"huaweicloud_apig_acl_policies": apig.DataSourceAclPolicies(),
494+
"huaweicloud_apig_api_associated_acl_policies": apig.DataSourceApiAssociatedAclPolicies(),
495+
"huaweicloud_apig_api_associated_applications": apig.DataSourceApiAssociatedApplications(),
496+
"huaweicloud_apig_api_associated_plugins": apig.DataSourceApiAssociatedPlugins(),
497+
"huaweicloud_apig_api_associated_signatures": apig.DataSourceApiAssociatedSignatures(),
498+
"huaweicloud_apig_api_associated_throttling_policies": apig.DataSourceApiAssociatedThrottlingPolicies(),
499+
"huaweicloud_apig_api_basic_configurations": apig.DataSourceApiBasicConfigurations(),
500+
"huaweicloud_apig_api": apig.DataSourceApi(),
501+
"huaweicloud_apig_apis_tags": apig.DataSourceApisTags(),
502+
"huaweicloud_apig_appcodes": apig.DataSourceAppcodes(),
503+
"huaweicloud_apig_applications": apig.DataSourceApplications(),
504+
"huaweicloud_apig_availability_zones": apig.DataSourceAvailabilityZones(),
505+
"huaweicloud_apig_application_acl": apig.DataSourceApplicationAcl(),
506+
"huaweicloud_apig_application_quotas": apig.DataSourceApigApplicationQuotas(),
507+
"huaweicloud_apig_channels": apig.DataSourceChannels(),
508+
"huaweicloud_apig_custom_authorizers": apig.DataSourceCustomAuthorizers(),
509+
"huaweicloud_apig_endpoint_connections": apig.DataSourceApigEndpointConnections(),
510+
"huaweicloud_apig_environment_variables": apig.DataSourceApigEnvironmentVariables(),
511+
"huaweicloud_apig_environments": apig.DataSourceEnvironments(),
512+
"huaweicloud_apig_groups": apig.DataSourceGroups(),
513+
"huaweicloud_apig_instance_associated_ssl_certificates": apig.DataSourceInstanceAssociatedSSLCertificates(),
514+
"huaweicloud_apig_instance_features": apig.DataSourceInstanceFeatures(),
515+
"huaweicloud_apig_instance_quotas": apig.DataSourceInstanceQuotas(),
516+
"huaweicloud_apig_instance_supported_features": apig.DataSourceInstanceSupportedFeatures(),
517+
"huaweicloud_apig_instances_filter": apig.DataSourceInstancesFilter(),
518+
"huaweicloud_apig_instances": apig.DataSourceInstances(),
519+
"huaweicloud_apig_orchestration_rules": apig.DataSourceOrchestrationRules(),
520+
"huaweicloud_apig_orchestration_rule_associated_apis": apig.DataSourceOrchestrationRuleAssociatedApis(),
521+
"huaweicloud_apig_plugins": apig.DataSourcePlugins(),
522+
"huaweicloud_apig_signatures": apig.DataSourceSignatures(),
523+
"huaweicloud_apig_throttling_policies": apig.DataSourceThrottlingPolicies(),
524524

525525
"huaweicloud_as_activity_logs": as.DataSourceActivityLogs(),
526526
"huaweicloud_asv2_activity_logs": as.DataSourceAsv2ActivityLogs(),

‎huaweicloud/services/acceptance/apig/data_source_huaweicloud_apig_instance_associated_ssl_certificates_test.go

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@ import (
1313

1414
func TestAccDataSourceInstanceAssociatedSSLCertificates_basic(t *testing.T) {
1515
var (
16-
dataSource = "data.huaweicloud_apig_instance_ssl_certificates.test"
16+
dataSource = "data.huaweicloud_apig_instance_associated_ssl_certificates.test"
1717
dc = acceptance.InitDataSourceCheck(dataSource)
1818

19-
byInstanceId = "data.huaweicloud_apig_instance_ssl_certificates.filter_by_instance_id"
19+
byInstanceId = "data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_instance_id"
2020
dcByInstanceId = acceptance.InitDataSourceCheck(byInstanceId)
2121

22-
byName = "data.huaweicloud_apig_instance_ssl_certificates.filter_by_name"
22+
byName = "data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_name"
2323
dcByName = acceptance.InitDataSourceCheck(byName)
2424

25-
byCommonName = "data.huaweicloud_apig_instance_ssl_certificates.filter_by_common_name"
25+
byCommonName = "data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_common_name"
2626
dcByCommonName = acceptance.InitDataSourceCheck(byCommonName)
2727

28-
bySignatureAlgorithm = "data.huaweicloud_apig_instance_ssl_certificates.filter_by_signature_algorithm"
28+
bySignatureAlgorithm = "data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_signature_algorithm"
2929
dcBySignatureAlgorithm = acceptance.InitDataSourceCheck(bySignatureAlgorithm)
3030

31-
byType = "data.huaweicloud_apig_instance_ssl_certificates.filter_by_type"
31+
byType = "data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_type"
3232
dcByType = acceptance.InitDataSourceCheck(byType)
3333

34-
byAlgorithmType = "data.huaweicloud_apig_instance_ssl_certificates.filter_by_algorithm_type"
34+
byAlgorithmType = "data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_algorithm_type"
3535
dcByAlgorithmType = acceptance.InitDataSourceCheck(byAlgorithmType)
3636
)
3737

@@ -75,7 +75,7 @@ func TestAccDataSourceInstanceAssociatedSSLCertificates_basic(t *testing.T) {
7575

7676
func testAccDataSourceInstanceAssociatedSSLCertificates_step1() string {
7777
return fmt.Sprintf(`
78-
data "huaweicloud_apig_instance_ssl_certificates" "test" {
78+
data "huaweicloud_apig_instance_associated_ssl_certificates" "test" {
7979
instance_id = "%[1]s"
8080
}
8181
@@ -84,13 +84,13 @@ locals {
8484
instance_id = "%[1]s"
8585
}
8686
87-
data "huaweicloud_apig_instance_ssl_certificates" "filter_by_instance_id" {
87+
data "huaweicloud_apig_instance_associated_ssl_certificates" "filter_by_instance_id" {
8888
instance_id = local.instance_id
8989
}
9090
9191
locals {
9292
instance_id_filter_result = [
93-
for v in data.huaweicloud_apig_instance_ssl_certificates.filter_by_instance_id.certificates[*].instance_id : v == local.instance_id || v == "common"
93+
for v in data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_instance_id.certificates[*].instance_id : v == local.instance_id || v == "common"
9494
]
9595
}
9696
@@ -100,17 +100,17 @@ output "instance_id_filter_is_useful" {
100100
101101
# Filter by Name
102102
locals {
103-
name = data.huaweicloud_apig_instance_ssl_certificates.test.certificates[0].name
103+
name = data.huaweicloud_apig_instance_associated_ssl_certificates.test.certificates[0].name
104104
}
105105
106-
data "huaweicloud_apig_instance_ssl_certificates" "filter_by_name" {
106+
data "huaweicloud_apig_instance_associated_ssl_certificates" "filter_by_name" {
107107
instance_id = local.instance_id
108108
name = local.name
109109
}
110110
111111
locals {
112112
name_filter_result = [
113-
for v in data.huaweicloud_apig_instance_ssl_certificates.filter_by_name.certificates[*].name : v == local.name
113+
for v in data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_name.certificates[*].name : v == local.name
114114
]
115115
}
116116
@@ -120,17 +120,17 @@ output "certificate_name_filter_is_useful" {
120120
121121
# Filter by Common Name
122122
locals {
123-
common_name = data.huaweicloud_apig_instance_ssl_certificates.test.certificates[0].common_name
123+
common_name = data.huaweicloud_apig_instance_associated_ssl_certificates.test.certificates[0].common_name
124124
}
125125
126-
data "huaweicloud_apig_instance_ssl_certificates" "filter_by_common_name" {
126+
data "huaweicloud_apig_instance_associated_ssl_certificates" "filter_by_common_name" {
127127
instance_id = local.instance_id
128128
common_name = local.common_name
129129
}
130130
131131
locals {
132132
common_name_filter_result = [
133-
for v in data.huaweicloud_apig_instance_ssl_certificates.filter_by_common_name.certificates[*].common_name : v == local.common_name
133+
for v in data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_common_name.certificates[*].common_name : v == local.common_name
134134
]
135135
}
136136
@@ -140,17 +140,17 @@ output "certificate_common_name_filter_is_useful" {
140140
141141
# Filter by Signature Algorithm
142142
locals {
143-
signature_algorithm = data.huaweicloud_apig_instance_ssl_certificates.test.certificates[0].signature_algorithm
143+
signature_algorithm = data.huaweicloud_apig_instance_associated_ssl_certificates.test.certificates[0].signature_algorithm
144144
}
145145
146-
data "huaweicloud_apig_instance_ssl_certificates" "filter_by_signature_algorithm" {
146+
data "huaweicloud_apig_instance_associated_ssl_certificates" "filter_by_signature_algorithm" {
147147
instance_id = local.instance_id
148148
signature_algorithm = local.signature_algorithm
149149
}
150150
151151
locals {
152152
signature_algorithm_filter_result = [
153-
for v in data.huaweicloud_apig_instance_ssl_certificates.filter_by_signature_algorithm.certificates[*].signature_algorithm : v == local.signature_algorithm
153+
for v in data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_signature_algorithm.certificates[*].signature_algorithm : v == local.signature_algorithm
154154
]
155155
}
156156
@@ -160,17 +160,17 @@ output "certificate_signature_algorithm_filter_is_useful" {
160160
161161
# Filter by Type
162162
locals {
163-
type = data.huaweicloud_apig_instance_ssl_certificates.test.certificates[0].type
163+
type = data.huaweicloud_apig_instance_associated_ssl_certificates.test.certificates[0].type
164164
}
165165
166-
data "huaweicloud_apig_instance_ssl_certificates" "filter_by_type" {
166+
data "huaweicloud_apig_instance_associated_ssl_certificates" "filter_by_type" {
167167
instance_id = local.instance_id
168168
type = local.type
169169
}
170170
171171
locals {
172172
type_filter_result = [
173-
for v in data.huaweicloud_apig_instance_ssl_certificates.filter_by_type.certificates[*].type : v == local.type
173+
for v in data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_type.certificates[*].type : v == local.type
174174
]
175175
}
176176
@@ -180,17 +180,17 @@ output "certificate_type_filter_is_useful" {
180180
181181
# Filter by Algorithm Type
182182
locals {
183-
algorithm_type = data.huaweicloud_apig_instance_ssl_certificates.test.certificates[0].algorithm_type
183+
algorithm_type = data.huaweicloud_apig_instance_associated_ssl_certificates.test.certificates[0].algorithm_type
184184
}
185185
186-
data "huaweicloud_apig_instance_ssl_certificates" "filter_by_algorithm_type" {
186+
data "huaweicloud_apig_instance_associated_ssl_certificates" "filter_by_algorithm_type" {
187187
instance_id = local.instance_id
188188
algorithm_type = local.algorithm_type
189189
}
190190
191191
locals {
192192
algorithm_type_result = [
193-
for v in data.huaweicloud_apig_instance_ssl_certificates.filter_by_algorithm_type[*].algorithm_type : v == local.algorithm_type
193+
for v in data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_algorithm_type[*].algorithm_type : v == local.algorithm_type
194194
]
195195
}
196196
@@ -208,13 +208,13 @@ locals {
208208
instance_id = "%[1]s"
209209
}
210210
211-
data "huaweicloud_apig_instance_ssl_certificates" "filter_by_invalid_instance_id" {
211+
data "huaweicloud_apig_instance_associated_ssl_certificates" "filter_by_invalid_instance_id" {
212212
instance_id = local.instance_id
213213
}
214214
215215
locals {
216216
invalid_instance_id_filter_result = [
217-
for v in data.huaweicloud_apig_instance_ssl_certificates.filter_by_invalid_instance_id.certificates[*].instance_id : v == local.instance_id || v == "common"
217+
for v in data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_invalid_instance_id.certificates[*].instance_id : v == local.instance_id || v == "common"
218218
]
219219
}
220220

0 commit comments

Comments
 (0)