From 52216863335278ad5faca89217a95cc4f8d7f426 Mon Sep 17 00:00:00 2001 From: suraj Date: Thu, 16 Jun 2022 18:25:19 +0530 Subject: [PATCH 1/4] * Made GCP private key sensitive through schema * GCP Account Doc * version changes --- CHANGELOG.md | 4 + docs/guides/aws/aws_provider.md | 1 - docs/guides/azure/azure_provider.md | 1 - .../communication_setting_provider.md | 1 - docs/guides/group/group_provider.md | 1 - .../profile_settings_provider.md | 1 - .../report_config/report_config_provider.md | 1 - docs/guides/sso_user/sso_user_provider.md | 1 - docs/guides/user/user_provider.md | 1 - docs/index.md | 2 +- docs/resources/aws_cloudformation_stack.md | 3 +- docs/resources/conformity_aws_account.md | 4 +- docs/resources/conformity_azure_account.md | 12 -- .../conformity_communication_settings.md | 12 -- docs/resources/conformity_gcp_account.md | 120 ++++++++++++++++++ docs/resources/conformity_gcp_org.md | 33 +++++ docs/resources/conformity_group.md | 12 -- docs/resources/conformity_profile.md | 12 -- docs/resources/conformity_report_config.md | 12 -- docs/resources/conformity_sso_user.md | 12 -- docs/resources/conformity_user.md | 12 -- example/access/provider.tf | 1 - example/aws/provider.tf | 1 - example/azure/provider.tf | 2 +- .../communication_setting/email/provider.tf | 1 - .../ms-teams/provider.tf | 1 - .../multiple/provider.tf | 1 - .../communication_setting/slack/provider.tf | 1 - example/communication_setting/sms/provider.tf | 1 - example/communication_setting/sns/provider.tf | 1 - .../communication_setting/webhook/provider.tf | 1 - example/gcp/provider.tf | 1 - example/gcp_organisation/provider.tf | 1 - example/group/provider.tf | 1 - example/import/account/aws/provider.tf | 2 +- example/import/account/azure/provider.tf | 2 +- .../import/communication_setting/provider.tf | 2 +- example/import/group/provider.tf | 2 +- example/import/profile_settings/provider.tf | 2 +- example/import/report_config/main/provider.tf | 2 +- example/import/user/sso_user/provider.tf | 2 +- example/import/user/user/provider.tf | 2 +- .../existing_profile/provider.tf | 2 +- .../multiple_extra_settings/provider.tf | 2 +- .../values_string_int/provider.tf | 2 +- .../profile_settings/with_rules/provider.tf | 2 +- .../without_rules/provider.tf | 2 +- example/report_config/main/provider.tf | 2 +- example/user/sso_user/provider.tf | 2 +- example/user/user/provider.tf | 2 +- script/manual-install-from-github.bat | 2 +- script/manual-install-from-github.sh | 2 +- 52 files changed, 180 insertions(+), 128 deletions(-) create mode 100644 docs/resources/conformity_gcp_account.md create mode 100644 docs/resources/conformity_gcp_org.md diff --git a/CHANGELOG.md b/CHANGELOG.md index d7db3bd..00a5d51 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.2 +* Made GCP private key sensitive through schema +* GCP Account Doc + ## 0.4.1 * GCP read issue fixed * Cloudone URL changes and region support diff --git a/docs/guides/aws/aws_provider.md b/docs/guides/aws/aws_provider.md index 7f91e10..cee2d2d 100644 --- a/docs/guides/aws/aws_provider.md +++ b/docs/guides/aws/aws_provider.md @@ -32,7 +32,6 @@ Note: You can always change the values declared according to your choice. terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } aws = { diff --git a/docs/guides/azure/azure_provider.md b/docs/guides/azure/azure_provider.md index b138658..7bf7dd9 100644 --- a/docs/guides/azure/azure_provider.md +++ b/docs/guides/azure/azure_provider.md @@ -32,7 +32,6 @@ Note: You can always change the values declared according to your choice. terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/docs/guides/communication_setting/communication_setting_provider.md b/docs/guides/communication_setting/communication_setting_provider.md index faef213..3012030 100644 --- a/docs/guides/communication_setting/communication_setting_provider.md +++ b/docs/guides/communication_setting/communication_setting_provider.md @@ -29,7 +29,6 @@ Note: You can always change the values declared according to your choice. terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/docs/guides/group/group_provider.md b/docs/guides/group/group_provider.md index 309c1ef..10dd549 100644 --- a/docs/guides/group/group_provider.md +++ b/docs/guides/group/group_provider.md @@ -36,7 +36,6 @@ Note: You can always change the values declared according to your choice. terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/docs/guides/profile_settings/profile_settings_provider.md b/docs/guides/profile_settings/profile_settings_provider.md index 7da21bd..3522643 100644 --- a/docs/guides/profile_settings/profile_settings_provider.md +++ b/docs/guides/profile_settings/profile_settings_provider.md @@ -29,7 +29,6 @@ Note: You can always change the values declared according to your choice. terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/docs/guides/report_config/report_config_provider.md b/docs/guides/report_config/report_config_provider.md index e0195b1..93f2a56 100644 --- a/docs/guides/report_config/report_config_provider.md +++ b/docs/guides/report_config/report_config_provider.md @@ -29,7 +29,6 @@ Note: You can always change the values declared according to your choice. terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/docs/guides/sso_user/sso_user_provider.md b/docs/guides/sso_user/sso_user_provider.md index 85b46d4..b158670 100644 --- a/docs/guides/sso_user/sso_user_provider.md +++ b/docs/guides/sso_user/sso_user_provider.md @@ -44,7 +44,6 @@ Note: You can always change the values declared according to your choice. terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/docs/guides/user/user_provider.md b/docs/guides/user/user_provider.md index 583e288..78a7250 100644 --- a/docs/guides/user/user_provider.md +++ b/docs/guides/user/user_provider.md @@ -44,7 +44,6 @@ Note: You can always change the values declared according to your choice. terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/docs/index.md b/docs/index.md index 54557b4..9afe0cf 100644 --- a/docs/index.md +++ b/docs/index.md @@ -77,7 +77,7 @@ provider "aws" { terraform { required_providers { conformity = { - version = "0.4.1" + version = "0.4.2" source = "trendmicro/conformity" } aws = { diff --git a/docs/resources/aws_cloudformation_stack.md b/docs/resources/aws_cloudformation_stack.md index 80f1198..48f9fd9 100644 --- a/docs/resources/aws_cloudformation_stack.md +++ b/docs/resources/aws_cloudformation_stack.md @@ -47,14 +47,13 @@ terraform import aws_cloudformation_stack.stack CloudConformity | Name | Version | |------|---------| | [aws](#requirement\_aws) | >= 3.44.0 | -| [conformity](#requirement\_conformity) | 0.4.1 | ## Providers | Name | Version | |------|---------| | [aws](#provider\_aws) | >= 3.44.0 | -| [conformity](#provider\_conformity) | 0.4.1 | + ## Resources diff --git a/docs/resources/conformity_aws_account.md b/docs/resources/conformity_aws_account.md index e633ef9..921e9ca 100644 --- a/docs/resources/conformity_aws_account.md +++ b/docs/resources/conformity_aws_account.md @@ -263,14 +263,14 @@ terraform show -no-color >> main.tf | Name | Version | |------|---------| | [aws](#requirement\_aws) | >= 3.44.0 | -| [conformity](#requirement\_conformity) | 0.4.1 | + ## Providers | Name | Version | |------|---------| | [aws](#provider\_aws) | >= 3.44.0 | -| [conformity](#provider\_conformity) | 0.4.1 | + ## Resources diff --git a/docs/resources/conformity_azure_account.md b/docs/resources/conformity_azure_account.md index 6d090c9..2543481 100644 --- a/docs/resources/conformity_azure_account.md +++ b/docs/resources/conformity_azure_account.md @@ -130,15 +130,3 @@ Run `terraform show -no-color >> main.tf` to import the resources on the `main.t ```hcl terraform show -no-color >> main.tf ``` - -## Requirements - -| Name | Version | -|------|---------| -| [conformity](#requirement\_conformity) | 0.4.1 | - -## Providers - -| Name | Version | -|------|---------| -| [conformity](#provider\_conformity) | 0.4.1 | \ No newline at end of file diff --git a/docs/resources/conformity_communication_settings.md b/docs/resources/conformity_communication_settings.md index 4d574a7..a3f95e0 100644 --- a/docs/resources/conformity_communication_settings.md +++ b/docs/resources/conformity_communication_settings.md @@ -154,15 +154,3 @@ Run `terraform show -no-color >> main.tf` to import the resources on the `main.t ```hcl terraform show -no-color >> main.tf ``` - -## Requirements - -| Name | Version | -|------|---------| -| [conformity](#requirement\_conformity) | 0.4.1 | - -## Providers - -| Name | Version | -|------|---------| -| [conformity](#provider\_conformity) | 0.4.1 | \ No newline at end of file diff --git a/docs/resources/conformity_gcp_account.md b/docs/resources/conformity_gcp_account.md new file mode 100644 index 0000000..720f2af --- /dev/null +++ b/docs/resources/conformity_gcp_account.md @@ -0,0 +1,120 @@ +--- +page_title: "conformity_gcp_account Resource" +subcategory: "GCP" +description: |- + Provides a Conformity Account. +--- + +# Resource `conformity_gcp_account` +Provides a Conformity GCP Account. + +## Example Usage With GCP Conformity To Create Account Only +```hcl + +resource "conformity_gcp_account" "gcp" { + name = "MyProject" + project_id = "conformity-346910" + project_name = "conformity" + service_account_unique_id = "10307221" + environment = "dev" + tags = ["staging"] + settings { + bot { + delay = 1 + disabled = false + disabled_regions = [ "ap-east-1", "ap-south-1" ] + } + // implement multiple-object-values + rule { + rule_id = "CloudAPI-001" + settings { + enabled = true + risk_level = "MEDIUM" + extra_settings { + name = "rotatingPeriod" + type = "single-number-value" + value = 90 + } + } + } + } +} +``` + +## Argument reference + - `name` (String) - (Required) The name of your account. + - `environment` (String) - (Required) The environment for your account. + - `projectId` (String) - (Required) The ID of your GCP Project. + - `projectName` (String) - (Required) The name of your GCP Project. + - `serviceAccountUniqueId` (String) - (Required) The unique ID of your GCP Service Account. + - `settings` - (Optional) List: (Can be multiple declaration) + + Inside `settings` there can be a `bot` set. + + - `bot` - (Optional) List: (Can be multiple declaration) + * `disabled` (Bool) - (Optional) True to disable or false to enable the Conformity Bot. + * `disabled_regions` (Array of Strings) - (Optional) - Possible values are "af-south-1", "ap-east-1", "ap-south-1", "ap-southeast-1", "ap-southeast-2", "ap-northeast-1", "ap-northeast-2", "ap-northeast-3", "ca-central-1", "eu-central-1", "eu-north-1", "eu-south-1", "eu-west-1", "eu-west-2", "eu-west-3", "me-south-1", "sa-east-1", "us-east-1", "us-east-2", "us-west-1", "us-west-2". This field can only be applied to AWS accounts. An attribute object containing a list of AWS regions for which Conformity Bot runs will be disabled. + * `delay` (Int) - (Optional) Sets the number of hours delay between Conformity Bot runs. + + - `settings` - (Optional) + * `enabled` (Bool) - (Optional) True for inclusion in bot detection, false for exclusion. + * `rule_exists` (Bool) - (Optional) True if rule exists. + * `risk_level` (String) - (Optional) - Risk level of the Conformity rule. Enum: "LOW" "MEDIUM" "HIGH" "VERY_HIGH" "EXTREME" + + Inside `settings` under `rule` set, there can be one `exceptions` set. + + - `exceptions` - (Optional) List: + * `filter_tags` (Array of Strings)- (Optional) An array of resource tags, resource tag keys or resource tag values that are exempted from the rule when it runs, e.g filterTags ["dev"] will exempt resource with tag "environment::dev from the rule". + * `resources` (Array of Strings) - (Optional) An array of resource IDs that are exempted from the rule when it runs. + * `tags` (Array of Strings) - (Optional) An array of resource tags that are exempted from the rule when it runs. + + Inside `settings` under `rule` set, there can be multiple `extra_settings` set. + + - `extra_settings` - (Optional) List: (Can be multiple declaration) + * `name` (String) - (Optional) (Keyword) Name of the extra setting. + * `type` (String) - (Required) Rule specific property. Values can be: "multiple-string-values", "multiple-number-values" "multiple-aws-account-values", "choice-multiple-value" "choice-single-value", "single-number-value", "single-string-value", "ttl", "single-value-regex", "countries", "multiple-ip-values", and "tags". + * `value` (String) - (Optional) Customisable value for rules that take on single name/value pairs. + * `regions` (Array of Strings) - (Optional) Rule specific property. + * `multiple-object-values` (Array of Strings) - (Optional) Rule specific property. + + Inside `extra_settings` under `settings` of `rule` set, there can be multiple declaration of `multiple-object-values` set. + + - `multiple-object-values` - (Optional) List: (Can be multiple declaration). + * `event_name` (String) - (Optional) Name of the event. + * `event_source` (String) - (Optional) Name of the event source + * `user_identity_type` (String) - (Required) Type of the Identity of the user. + + Inside `extra_settings` under `settings` of `rule` set, there can be multiple declaration of `mappings` set. And under `mappings` set, here can be multiple declaration of `values` set. + + - `values` - (Required) List: (Can be multiple declaration). An array (sometimes of objects) rules that take on a set of of values + * `name` (String) - (Optional) (Keyword) Name of the values. + * `type` (String) - (Required) Rule specific property. Values can be: "multiple-string-values", "multiple-number-values" "multiple-aws-account-values", "choice-multiple-value" "choice-single-value", "single-number-value", "single-string-value", "ttl", "single-value-regex", "countries", "multiple-ip-values", and "tags". + * `value` (String) - (Required) Description of the checkbox. + Note: `values` is required when you use `mappings`. + + Inside `values`, there can be multiple declaration of `values` set. + + - `values` - (Required) List: (Can be multiple declaration). + * `value` (String) - (Required) Description of the checkbox. + Note: If inside the `values` under the `mappings` has set `values` declared, you cannot use `value` anymore. Inside mappings, its either `values` with `values` set inside it or `values` with declared `value` inside it. + + Note: There is a condition for `type` attribute. If the specified is attribute is `value`, the possible values are "single-number-value", "single-string-value", "single-value-regex" and "ttl". If the specified is attribute is `values`, the declaration of it is inside the extra settings which can be a list and the possible values are "choice-multiple-value", "choice-single-value", "multiple-string-values", "multiple-number-values", "countries", "multiple-ip-values", "multiple-aws-account-values" and "tags". You cannot declare both `values` and `value` at the same time.See the table below: + +| type | possible value | Sample declaration | +|----------|-------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `value` | single-number-value, single-string-value, single-value-regex, ttl | included { …. exceptions { …. } extra_settings { …. type = "ttl" value = "72" } } | +| `values` | choice-multiple-value, choice-single-value, multiple-string-values, multiple-number-values, countries, multiple-ip-values, multiple-aws-account-values, tags | included { …. exceptions { …. } extra_settings { …. type = "choice-multiple-value" values { …. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + + - `id` - The ID of the AWS account in Conformity managed by this resource + +Example usage on the template: + +```hcl +account { + id = conformity_aws_account.aws.id +} +``` diff --git a/docs/resources/conformity_gcp_org.md b/docs/resources/conformity_gcp_org.md new file mode 100644 index 0000000..0c75131 --- /dev/null +++ b/docs/resources/conformity_gcp_org.md @@ -0,0 +1,33 @@ +--- +page_title: "conformity_gcp_org Resource" +subcategory: "GCP" +description: |- + Provides a Conformity Organisation. +--- + +# Resource `conformity_gcp_org` +Provides a Conformity GCP Organisation. + +## Example Usage With GCP Conformity To Create Account Only +```hcl + +resource "conformity_gcp_org" "gcp_org" { + private_key = "privetkey" + service_account_name = "MySubscription" + type = "service_account" + project_id = "conformity-346910" + private_key_id = "c1c3688e7c" + client_email = "iam.gserviceaccount.com" + client_id = "811129548" + auth_uri = "https://accounts.google.com/o/oauth2/auth" + token_uri = "https://oauth2.googleapis.com/token" + auth_provider_x509_cert_url = "https://www.googleapis.com/oauth2/v1/certs" + client_x509_cert_url = "https://www.googleapis.com/robot/v1/metadata/x509/cloud-one-conformity-bot%40conformity-346910.iam.gserviceaccount.com" +} +``` + +## Argument reference + - `serviceAccountName` (String) - (Required) The name of your organisation. + + Other details you will get it from `serviceAccountKeyJson` + \ No newline at end of file diff --git a/docs/resources/conformity_group.md b/docs/resources/conformity_group.md index b0ea27b..db75fd3 100644 --- a/docs/resources/conformity_group.md +++ b/docs/resources/conformity_group.md @@ -59,15 +59,3 @@ Run `terraform show -no-color >> main.tf` to import the resources on the `main.t ```hcl terraform show -no-color >> main.tf ``` - -## Requirements - -| Name | Version | -|------|---------| -| [conformity](#requirement\_conformity) | 0.4.1 | - -## Providers - -| Name | Version | -|------|---------| -| [conformity](#provider\_conformity) | 0.4.1 | \ No newline at end of file diff --git a/docs/resources/conformity_profile.md b/docs/resources/conformity_profile.md index 512793c..d2fb0d7 100644 --- a/docs/resources/conformity_profile.md +++ b/docs/resources/conformity_profile.md @@ -167,15 +167,3 @@ Run `terraform show -no-color >> main.tf` to import the resources on the `main.t ```hcl terraform show -no-color >> main.tf ``` - -## Requirements - -| Name | Version | -|------|---------| -| [conformity](#requirement\_conformity) | 0.4.1 | - -## Providers - -| Name | Version | -|------|---------| -| [conformity](#provider\_conformity) | 0.4.1 | \ No newline at end of file diff --git a/docs/resources/conformity_report_config.md b/docs/resources/conformity_report_config.md index cc777e3..93c1d1f 100644 --- a/docs/resources/conformity_report_config.md +++ b/docs/resources/conformity_report_config.md @@ -127,15 +127,3 @@ Run `terraform show -no-color >> main.tf` to import the resources on the `main.t ```hcl terraform show -no-color >> main.tf ``` - -## Requirements - -| Name | Version | -|------|---------| -| [conformity](#requirement\_conformity) | 0.4.1 | - -## Providers - -| Name | Version | -|------|---------| -| [conformity](#provider\_conformity) | 0.4.1 | \ No newline at end of file diff --git a/docs/resources/conformity_sso_user.md b/docs/resources/conformity_sso_user.md index 4923cc1..6ccbbec 100644 --- a/docs/resources/conformity_sso_user.md +++ b/docs/resources/conformity_sso_user.md @@ -83,15 +83,3 @@ Run `terraform show -no-color >> main.tf` to import the resources on the `main.t ```hcl terraform show -no-color >> main.tf ``` - -## Requirements - -| Name | Version | -|------|---------| -| [conformity](#requirement\_conformity) | 0.4.1 | - -## Providers - -| Name | Version | -|------|---------| -| [conformity](#provider\_conformity) | 0.4.1 | \ No newline at end of file diff --git a/docs/resources/conformity_user.md b/docs/resources/conformity_user.md index afc0667..9bc9206 100644 --- a/docs/resources/conformity_user.md +++ b/docs/resources/conformity_user.md @@ -82,15 +82,3 @@ Run `terraform show -no-color >> main.tf` to import the resources on the `main.t ```hcl terraform show -no-color >> main.tf ``` - -## Requirements - -| Name | Version | -|------|---------| -| [conformity](#requirement\_conformity) | 0.4.1 | - -## Providers - -| Name | Version | -|------|---------| -| [conformity](#provider\_conformity) | 0.4.1 | \ No newline at end of file diff --git a/example/access/provider.tf b/example/access/provider.tf index 1b7f7c3..43b6c66 100644 --- a/example/access/provider.tf +++ b/example/access/provider.tf @@ -1,7 +1,6 @@ terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/example/aws/provider.tf b/example/aws/provider.tf index 412bec4..64fc0d7 100644 --- a/example/aws/provider.tf +++ b/example/aws/provider.tf @@ -1,7 +1,6 @@ terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } aws = { diff --git a/example/azure/provider.tf b/example/azure/provider.tf index 314ad80..3fffdc7 100644 --- a/example/azure/provider.tf +++ b/example/azure/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } diff --git a/example/communication_setting/email/provider.tf b/example/communication_setting/email/provider.tf index 1b7f7c3..43b6c66 100644 --- a/example/communication_setting/email/provider.tf +++ b/example/communication_setting/email/provider.tf @@ -1,7 +1,6 @@ terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/example/communication_setting/ms-teams/provider.tf b/example/communication_setting/ms-teams/provider.tf index 1b7f7c3..43b6c66 100644 --- a/example/communication_setting/ms-teams/provider.tf +++ b/example/communication_setting/ms-teams/provider.tf @@ -1,7 +1,6 @@ terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/example/communication_setting/multiple/provider.tf b/example/communication_setting/multiple/provider.tf index 1b7f7c3..43b6c66 100644 --- a/example/communication_setting/multiple/provider.tf +++ b/example/communication_setting/multiple/provider.tf @@ -1,7 +1,6 @@ terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/example/communication_setting/slack/provider.tf b/example/communication_setting/slack/provider.tf index 1b7f7c3..43b6c66 100644 --- a/example/communication_setting/slack/provider.tf +++ b/example/communication_setting/slack/provider.tf @@ -1,7 +1,6 @@ terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/example/communication_setting/sms/provider.tf b/example/communication_setting/sms/provider.tf index 1b7f7c3..43b6c66 100644 --- a/example/communication_setting/sms/provider.tf +++ b/example/communication_setting/sms/provider.tf @@ -1,7 +1,6 @@ terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/example/communication_setting/sns/provider.tf b/example/communication_setting/sns/provider.tf index 1b7f7c3..43b6c66 100644 --- a/example/communication_setting/sns/provider.tf +++ b/example/communication_setting/sns/provider.tf @@ -1,7 +1,6 @@ terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/example/communication_setting/webhook/provider.tf b/example/communication_setting/webhook/provider.tf index 1b7f7c3..43b6c66 100644 --- a/example/communication_setting/webhook/provider.tf +++ b/example/communication_setting/webhook/provider.tf @@ -1,7 +1,6 @@ terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/example/gcp/provider.tf b/example/gcp/provider.tf index 314ad80..c1ade92 100644 --- a/example/gcp/provider.tf +++ b/example/gcp/provider.tf @@ -1,7 +1,6 @@ terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } diff --git a/example/gcp_organisation/provider.tf b/example/gcp_organisation/provider.tf index 314ad80..c1ade92 100644 --- a/example/gcp_organisation/provider.tf +++ b/example/gcp_organisation/provider.tf @@ -1,7 +1,6 @@ terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } diff --git a/example/group/provider.tf b/example/group/provider.tf index 1b7f7c3..43b6c66 100644 --- a/example/group/provider.tf +++ b/example/group/provider.tf @@ -1,7 +1,6 @@ terraform { required_providers { conformity = { - version = "0.4.1" source = "trendmicro/conformity" } } diff --git a/example/import/account/aws/provider.tf b/example/import/account/aws/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/import/account/aws/provider.tf +++ b/example/import/account/aws/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/import/account/azure/provider.tf b/example/import/account/azure/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/import/account/azure/provider.tf +++ b/example/import/account/azure/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/import/communication_setting/provider.tf b/example/import/communication_setting/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/import/communication_setting/provider.tf +++ b/example/import/communication_setting/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/import/group/provider.tf b/example/import/group/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/import/group/provider.tf +++ b/example/import/group/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/import/profile_settings/provider.tf b/example/import/profile_settings/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/import/profile_settings/provider.tf +++ b/example/import/profile_settings/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/import/report_config/main/provider.tf b/example/import/report_config/main/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/import/report_config/main/provider.tf +++ b/example/import/report_config/main/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/import/user/sso_user/provider.tf b/example/import/user/sso_user/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/import/user/sso_user/provider.tf +++ b/example/import/user/sso_user/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/import/user/user/provider.tf b/example/import/user/user/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/import/user/user/provider.tf +++ b/example/import/user/user/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/profile_settings/existing_profile/provider.tf b/example/profile_settings/existing_profile/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/profile_settings/existing_profile/provider.tf +++ b/example/profile_settings/existing_profile/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/profile_settings/multiple_extra_settings/provider.tf b/example/profile_settings/multiple_extra_settings/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/profile_settings/multiple_extra_settings/provider.tf +++ b/example/profile_settings/multiple_extra_settings/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/profile_settings/values_string_int/provider.tf b/example/profile_settings/values_string_int/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/profile_settings/values_string_int/provider.tf +++ b/example/profile_settings/values_string_int/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/profile_settings/with_rules/provider.tf b/example/profile_settings/with_rules/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/profile_settings/with_rules/provider.tf +++ b/example/profile_settings/with_rules/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/profile_settings/without_rules/provider.tf b/example/profile_settings/without_rules/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/profile_settings/without_rules/provider.tf +++ b/example/profile_settings/without_rules/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/report_config/main/provider.tf b/example/report_config/main/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/report_config/main/provider.tf +++ b/example/report_config/main/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/user/sso_user/provider.tf b/example/user/sso_user/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/user/sso_user/provider.tf +++ b/example/user/sso_user/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/example/user/user/provider.tf b/example/user/user/provider.tf index 1b7f7c3..08ad84b 100644 --- a/example/user/user/provider.tf +++ b/example/user/user/provider.tf @@ -1,7 +1,7 @@ terraform { required_providers { conformity = { - version = "0.4.1" + source = "trendmicro/conformity" } } diff --git a/script/manual-install-from-github.bat b/script/manual-install-from-github.bat index b4ec0cb..93937c4 100644 --- a/script/manual-install-from-github.bat +++ b/script/manual-install-from-github.bat @@ -11,7 +11,7 @@ cd %download% set owner=trendmicro set name=conformity set repo=terraform-provider-%name% -set version=0.4.1 +set version=0.4.2 set token=YOUR_TOKEN set os_arch=windows_amd64 diff --git a/script/manual-install-from-github.sh b/script/manual-install-from-github.sh index 8022de9..26a7b9b 100755 --- a/script/manual-install-from-github.sh +++ b/script/manual-install-from-github.sh @@ -14,7 +14,7 @@ cd ${download} owner="trendmicro" name="conformity" repo="terraform-provider-${name}" -version="0.4.1" +version="0.4.2" token="YOUR_TOKEN" os_arch="darwin_amd64" From 43f88f8df2bd885dda6b49a86ec4324a997d39b4 Mon Sep 17 00:00:00 2001 From: suraj Date: Thu, 16 Jun 2022 18:26:59 +0530 Subject: [PATCH 2/4] * Made GCP private key sensitive through schema * GCP Account Doc * version changes --- conformity/resource_gcp_org.go | 1 + 1 file changed, 1 insertion(+) diff --git a/conformity/resource_gcp_org.go b/conformity/resource_gcp_org.go index fd34026..3c7cb35 100644 --- a/conformity/resource_gcp_org.go +++ b/conformity/resource_gcp_org.go @@ -34,6 +34,7 @@ func resourceGCPOrg() *schema.Resource { "private_key": { Type: schema.TypeString, Required: true, + Sensitive: true, }, "client_email": { Type: schema.TypeString, From 9fe5ff096a66299ede48d9c4bd79c0aea507b02f Mon Sep 17 00:00:00 2001 From: suraj Date: Thu, 16 Jun 2022 18:35:50 +0530 Subject: [PATCH 3/4] conformity_azure_account: environment field should not be required --- conformity/resource_azure_account.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conformity/resource_azure_account.go b/conformity/resource_azure_account.go index 0d70a8f..b03bbe1 100644 --- a/conformity/resource_azure_account.go +++ b/conformity/resource_azure_account.go @@ -22,7 +22,7 @@ func resourceAzureAccount() *schema.Resource { }, "environment": { Type: schema.TypeString, - Required: true, + Optional: true, }, "subscription_id": { Type: schema.TypeString, From 9e05a8e3f2fcf5b88a29a6c393fce5a0d02bba93 Mon Sep 17 00:00:00 2001 From: suraj Date: Thu, 16 Jun 2022 18:35:57 +0530 Subject: [PATCH 4/4] conformity_azure_account: environment field should not be required --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00a5d51..71bb48c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 0.4.2 * Made GCP private key sensitive through schema * GCP Account Doc +* conformity_azure_account: environment field should not be required ## 0.4.1 * GCP read issue fixed