Skip to content

fix(apig/ssl_certificates): fix some issues #7416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+62 −60
Open

fix(apig/ssl_certificates): fix some issues #7416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions docs/data-sources/apig_instance_associated_ssl_certificates.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Use this data source to get SSL certificate list associated with the specified i
```hcl
variable "instance_id" {}

data "huaweicloud_apig_instance_ssl_certificates" "test" {
data "huaweicloud_apig_instance_associated_ssl_certificates" "test" {
instance_id = var.instance_id
}
```
Expand All @@ -28,7 +28,7 @@ data "huaweicloud_apig_instance_ssl_certificates" "test" {
variable "instance_id" {}
variable "common_domain_name" {}

data "huaweicloud_apig_instance_ssl_certificates" "test" {
data "huaweicloud_apig_instance_associated_ssl_certificates" "test" {
instance_id = var.instance_id
common_name = var.common_domain_name
}
Expand Down Expand Up @@ -67,6 +67,8 @@ The `certificates` block supports:

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

* `project_id` - The ID of the region project to which the SSL certificates belong.

* `name` - The name of the SSL certificate.

* `type` - The type of the SSL certificate.
Expand Down
62 changes: 31 additions & 31 deletions huaweicloud/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,37 +490,37 @@ func Provider() *schema.Provider {
"huaweicloud_aom_alarm_silence_rules": aom.DataSourceAlarmSilenceRules(),
"huaweicloud_aom_service_discovery_rules": aom.DataSourceServiceDiscoveryRules(),

"huaweicloud_apig_acl_policies": apig.DataSourceAclPolicies(),
"huaweicloud_apig_api_associated_acl_policies": apig.DataSourceApiAssociatedAclPolicies(),
"huaweicloud_apig_api_associated_applications": apig.DataSourceApiAssociatedApplications(),
"huaweicloud_apig_api_associated_plugins": apig.DataSourceApiAssociatedPlugins(),
"huaweicloud_apig_api_associated_signatures": apig.DataSourceApiAssociatedSignatures(),
"huaweicloud_apig_api_associated_throttling_policies": apig.DataSourceApiAssociatedThrottlingPolicies(),
"huaweicloud_apig_api_basic_configurations": apig.DataSourceApiBasicConfigurations(),
"huaweicloud_apig_api": apig.DataSourceApi(),
"huaweicloud_apig_apis_tags": apig.DataSourceApisTags(),
"huaweicloud_apig_appcodes": apig.DataSourceAppcodes(),
"huaweicloud_apig_applications": apig.DataSourceApplications(),
"huaweicloud_apig_availability_zones": apig.DataSourceAvailabilityZones(),
"huaweicloud_apig_application_acl": apig.DataSourceApplicationAcl(),
"huaweicloud_apig_application_quotas": apig.DataSourceApigApplicationQuotas(),
"huaweicloud_apig_channels": apig.DataSourceChannels(),
"huaweicloud_apig_custom_authorizers": apig.DataSourceCustomAuthorizers(),
"huaweicloud_apig_endpoint_connections": apig.DataSourceApigEndpointConnections(),
"huaweicloud_apig_environment_variables": apig.DataSourceApigEnvironmentVariables(),
"huaweicloud_apig_environments": apig.DataSourceEnvironments(),
"huaweicloud_apig_groups": apig.DataSourceGroups(),
"huaweicloud_apig_instance_ssl_certificates": apig.DataSourceInstanceAssociatedSSLCertificates(),
"huaweicloud_apig_instance_features": apig.DataSourceInstanceFeatures(),
"huaweicloud_apig_instance_quotas": apig.DataSourceInstanceQuotas(),
"huaweicloud_apig_instance_supported_features": apig.DataSourceInstanceSupportedFeatures(),
"huaweicloud_apig_instances_filter": apig.DataSourceInstancesFilter(),
"huaweicloud_apig_instances": apig.DataSourceInstances(),
"huaweicloud_apig_orchestration_rules": apig.DataSourceOrchestrationRules(),
"huaweicloud_apig_orchestration_rule_associated_apis": apig.DataSourceOrchestrationRuleAssociatedApis(),
"huaweicloud_apig_plugins": apig.DataSourcePlugins(),
"huaweicloud_apig_signatures": apig.DataSourceSignatures(),
"huaweicloud_apig_throttling_policies": apig.DataSourceThrottlingPolicies(),
"huaweicloud_apig_acl_policies": apig.DataSourceAclPolicies(),
"huaweicloud_apig_api_associated_acl_policies": apig.DataSourceApiAssociatedAclPolicies(),
"huaweicloud_apig_api_associated_applications": apig.DataSourceApiAssociatedApplications(),
"huaweicloud_apig_api_associated_plugins": apig.DataSourceApiAssociatedPlugins(),
"huaweicloud_apig_api_associated_signatures": apig.DataSourceApiAssociatedSignatures(),
"huaweicloud_apig_api_associated_throttling_policies": apig.DataSourceApiAssociatedThrottlingPolicies(),
"huaweicloud_apig_api_basic_configurations": apig.DataSourceApiBasicConfigurations(),
"huaweicloud_apig_api": apig.DataSourceApi(),
"huaweicloud_apig_apis_tags": apig.DataSourceApisTags(),
"huaweicloud_apig_appcodes": apig.DataSourceAppcodes(),
"huaweicloud_apig_applications": apig.DataSourceApplications(),
"huaweicloud_apig_availability_zones": apig.DataSourceAvailabilityZones(),
"huaweicloud_apig_application_acl": apig.DataSourceApplicationAcl(),
"huaweicloud_apig_application_quotas": apig.DataSourceApigApplicationQuotas(),
"huaweicloud_apig_channels": apig.DataSourceChannels(),
"huaweicloud_apig_custom_authorizers": apig.DataSourceCustomAuthorizers(),
"huaweicloud_apig_endpoint_connections": apig.DataSourceApigEndpointConnections(),
"huaweicloud_apig_environment_variables": apig.DataSourceApigEnvironmentVariables(),
"huaweicloud_apig_environments": apig.DataSourceEnvironments(),
"huaweicloud_apig_groups": apig.DataSourceGroups(),
"huaweicloud_apig_instance_associated_ssl_certificates": apig.DataSourceInstanceAssociatedSSLCertificates(),
"huaweicloud_apig_instance_features": apig.DataSourceInstanceFeatures(),
"huaweicloud_apig_instance_quotas": apig.DataSourceInstanceQuotas(),
"huaweicloud_apig_instance_supported_features": apig.DataSourceInstanceSupportedFeatures(),
"huaweicloud_apig_instances_filter": apig.DataSourceInstancesFilter(),
"huaweicloud_apig_instances": apig.DataSourceInstances(),
"huaweicloud_apig_orchestration_rules": apig.DataSourceOrchestrationRules(),
"huaweicloud_apig_orchestration_rule_associated_apis": apig.DataSourceOrchestrationRuleAssociatedApis(),
"huaweicloud_apig_plugins": apig.DataSourcePlugins(),
"huaweicloud_apig_signatures": apig.DataSourceSignatures(),
"huaweicloud_apig_throttling_policies": apig.DataSourceThrottlingPolicies(),

"huaweicloud_as_activity_logs": as.DataSourceActivityLogs(),
"huaweicloud_asv2_activity_logs": as.DataSourceAsv2ActivityLogs(),
Expand Down
54 changes: 27 additions & 27 deletions ...acceptance/apig/data_source_huaweicloud_apig_instance_associated_ssl_certificates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@

func TestAccDataSourceInstanceAssociatedSSLCertificates_basic(t *testing.T) {
var (
dataSource = "data.huaweicloud_apig_instance_ssl_certificates.test"
dataSource = "data.huaweicloud_apig_instance_associated_ssl_certificates.test"
dc = acceptance.InitDataSourceCheck(dataSource)

byInstanceId = "data.huaweicloud_apig_instance_ssl_certificates.filter_by_instance_id"
byInstanceId = "data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_instance_id"
dcByInstanceId = acceptance.InitDataSourceCheck(byInstanceId)

byName = "data.huaweicloud_apig_instance_ssl_certificates.filter_by_name"
byName = "data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_name"
dcByName = acceptance.InitDataSourceCheck(byName)

byCommonName = "data.huaweicloud_apig_instance_ssl_certificates.filter_by_common_name"
byCommonName = "data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_common_name"
dcByCommonName = acceptance.InitDataSourceCheck(byCommonName)

bySignatureAlgorithm = "data.huaweicloud_apig_instance_ssl_certificates.filter_by_signature_algorithm"
bySignatureAlgorithm = "data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_signature_algorithm"
dcBySignatureAlgorithm = acceptance.InitDataSourceCheck(bySignatureAlgorithm)

byType = "data.huaweicloud_apig_instance_ssl_certificates.filter_by_type"
byType = "data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_type"
dcByType = acceptance.InitDataSourceCheck(byType)

byAlgorithmType = "data.huaweicloud_apig_instance_ssl_certificates.filter_by_algorithm_type"
byAlgorithmType = "data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_algorithm_type"
dcByAlgorithmType = acceptance.InitDataSourceCheck(byAlgorithmType)
)

Expand Down Expand Up @@ -75,7 +75,7 @@

func testAccDataSourceInstanceAssociatedSSLCertificates_step1() string {
return fmt.Sprintf(`
data "huaweicloud_apig_instance_ssl_certificates" "test" {
data "huaweicloud_apig_instance_associated_ssl_certificates" "test" {
instance_id = "%[1]s"
}

Expand All @@ -84,13 +84,13 @@
instance_id = "%[1]s"
}

data "huaweicloud_apig_instance_ssl_certificates" "filter_by_instance_id" {
data "huaweicloud_apig_instance_associated_ssl_certificates" "filter_by_instance_id" {
instance_id = local.instance_id
}

locals {
instance_id_filter_result = [
for v in data.huaweicloud_apig_instance_ssl_certificates.filter_by_instance_id.certificates[*].instance_id : v == local.instance_id || v == "common"
for v in data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_instance_id.certificates[*].instance_id : v == local.instance_id || v == "common"

Check warning on line 93 in huaweicloud/services/acceptance/apig/data_source_huaweicloud_apig_instance_associated_ssl_certificates_test.go

View workflow job for this annotation

GitHub Actions / golangci 

line-length-limit: line is 163 characters, out of limit 150 (revive)
]
}

Expand All @@ -100,17 +100,17 @@

# Filter by Name
locals {
name = data.huaweicloud_apig_instance_ssl_certificates.test.certificates[0].name
name = data.huaweicloud_apig_instance_associated_ssl_certificates.test.certificates[0].name
}

data "huaweicloud_apig_instance_ssl_certificates" "filter_by_name" {
data "huaweicloud_apig_instance_associated_ssl_certificates" "filter_by_name" {
instance_id = local.instance_id
name = local.name
}

locals {
name_filter_result = [
for v in data.huaweicloud_apig_instance_ssl_certificates.filter_by_name.certificates[*].name : v == local.name
for v in data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_name.certificates[*].name : v == local.name
]
}

Expand All @@ -120,17 +120,17 @@

# Filter by Common Name
locals {
common_name = data.huaweicloud_apig_instance_ssl_certificates.test.certificates[0].common_name
common_name = data.huaweicloud_apig_instance_associated_ssl_certificates.test.certificates[0].common_name
}

data "huaweicloud_apig_instance_ssl_certificates" "filter_by_common_name" {
data "huaweicloud_apig_instance_associated_ssl_certificates" "filter_by_common_name" {
instance_id = local.instance_id
common_name = local.common_name
}

locals {
common_name_filter_result = [
for v in data.huaweicloud_apig_instance_ssl_certificates.filter_by_common_name.certificates[*].common_name : v == local.common_name
for v in data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_common_name.certificates[*].common_name : v == local.common_name
]
}

Expand All @@ -140,17 +140,17 @@

# Filter by Signature Algorithm
locals {
signature_algorithm = data.huaweicloud_apig_instance_ssl_certificates.test.certificates[0].signature_algorithm
signature_algorithm = data.huaweicloud_apig_instance_associated_ssl_certificates.test.certificates[0].signature_algorithm
}

data "huaweicloud_apig_instance_ssl_certificates" "filter_by_signature_algorithm" {
data "huaweicloud_apig_instance_associated_ssl_certificates" "filter_by_signature_algorithm" {
instance_id = local.instance_id
signature_algorithm = local.signature_algorithm
}

locals {
signature_algorithm_filter_result = [
for v in data.huaweicloud_apig_instance_ssl_certificates.filter_by_signature_algorithm.certificates[*].signature_algorithm : v == local.signature_algorithm
for v in data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_signature_algorithm.certificates[*].signature_algorithm : v == local.signature_algorithm

Check warning on line 153 in huaweicloud/services/acceptance/apig/data_source_huaweicloud_apig_instance_associated_ssl_certificates_test.go

View workflow job for this annotation

GitHub Actions / golangci 

line-length-limit: line is 170 characters, out of limit 150 (revive)
]
}

Expand All @@ -160,17 +160,17 @@

# Filter by Type
locals {
type = data.huaweicloud_apig_instance_ssl_certificates.test.certificates[0].type
type = data.huaweicloud_apig_instance_associated_ssl_certificates.test.certificates[0].type
}

data "huaweicloud_apig_instance_ssl_certificates" "filter_by_type" {
data "huaweicloud_apig_instance_associated_ssl_certificates" "filter_by_type" {
instance_id = local.instance_id
type = local.type
}

locals {
type_filter_result = [
for v in data.huaweicloud_apig_instance_ssl_certificates.filter_by_type.certificates[*].type : v == local.type
for v in data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_type.certificates[*].type : v == local.type
]
}

Expand All @@ -180,17 +180,17 @@

# Filter by Algorithm Type
locals {
algorithm_type = data.huaweicloud_apig_instance_ssl_certificates.test.certificates[0].algorithm_type
algorithm_type = data.huaweicloud_apig_instance_associated_ssl_certificates.test.certificates[0].algorithm_type
}

data "huaweicloud_apig_instance_ssl_certificates" "filter_by_algorithm_type" {
data "huaweicloud_apig_instance_associated_ssl_certificates" "filter_by_algorithm_type" {
instance_id = local.instance_id
algorithm_type = local.algorithm_type
}

locals {
algorithm_type_result = [
for v in data.huaweicloud_apig_instance_ssl_certificates.filter_by_algorithm_type[*].algorithm_type : v == local.algorithm_type
for v in data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_algorithm_type[*].algorithm_type : v == local.algorithm_type
]
}

Expand All @@ -208,13 +208,13 @@
instance_id = "%[1]s"
}

data "huaweicloud_apig_instance_ssl_certificates" "filter_by_invalid_instance_id" {
data "huaweicloud_apig_instance_associated_ssl_certificates" "filter_by_invalid_instance_id" {
instance_id = local.instance_id
}

locals {
invalid_instance_id_filter_result = [
for v in data.huaweicloud_apig_instance_ssl_certificates.filter_by_invalid_instance_id.certificates[*].instance_id : v == local.instance_id || v == "common"
for v in data.huaweicloud_apig_instance_associated_ssl_certificates.filter_by_invalid_instance_id.certificates[*].instance_id : v == local.instance_id || v == "common"

Check warning on line 217 in huaweicloud/services/acceptance/apig/data_source_huaweicloud_apig_instance_associated_ssl_certificates_test.go

View workflow job for this annotation

GitHub Actions / golangci 

line-length-limit: line is 171 characters, out of limit 150 (revive)
]
}

Expand Down
Loading