Skip to content
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.

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

Mark numerous key, password and connection string properties sensitive #1242

Merged
merged 1 commit into from
May 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 12 additions & 8 deletions azurerm/data_source_cosmos_db_account.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,23 +115,27 @@ func dataSourceArmCosmosDBAccount() *schema.Resource {
},

"primary_master_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"secondary_master_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"primary_readonly_master_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"secondary_readonly_master_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},
},
}
Expand Down
20 changes: 12 additions & 8 deletions azurerm/data_source_eventhub_namespace.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,27 @@ func dataSourceEventHubNamespace() *schema.Resource {
},

"default_primary_connection_string": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"default_secondary_connection_string": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"default_primary_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"default_secondary_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"tags": tagsForDataSourceSchema(),
Expand Down
10 changes: 6 additions & 4 deletions azurerm/data_source_kubernetes_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,18 @@ func dataSourceArmKubernetesCluster() *schema.Resource {
Computed: true,
},
"password": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},
"client_certificate": {
Type: schema.TypeString,
Computed: true,
},
"client_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},
"cluster_ca_certificate": {
Type: schema.TypeString,
Expand Down
30 changes: 18 additions & 12 deletions azurerm/data_source_storage_account.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,33 +123,39 @@ func dataSourceArmStorageAccount() *schema.Resource {
},

"primary_access_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"secondary_access_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"primary_connection_string": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"secondary_connection_string": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"primary_blob_connection_string": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"secondary_blob_connection_string": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"tags": tagsForDataSourceSchema(),
Expand Down
5 changes: 3 additions & 2 deletions azurerm/resource_arm_app_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,9 @@ func resourceArmAppService() *schema.Resource {
Required: true,
},
"value": {
Type: schema.TypeString,
Required: true,
Type: schema.TypeString,
Required: true,
Sensitive: true,
},
"type": {
Type: schema.TypeString,
Expand Down
5 changes: 3 additions & 2 deletions azurerm/resource_arm_app_service_slot.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,9 @@ func resourceArmAppServiceSlot() *schema.Resource {
Required: true,
},
"value": {
Type: schema.TypeString,
Required: true,
Type: schema.TypeString,
Required: true,
Sensitive: true,
},
"type": {
Type: schema.TypeString,
Expand Down
5 changes: 3 additions & 2 deletions azurerm/resource_arm_application_insights.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ func resourceArmApplicationInsights() *schema.Resource {
},

"instrumentation_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},
},
}
Expand Down
5 changes: 3 additions & 2 deletions azurerm/resource_arm_container_registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,9 @@ func resourceArmContainerRegistry() *schema.Resource {
},

"admin_password": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"tags": tagsSchema(),
Expand Down
25 changes: 15 additions & 10 deletions azurerm/resource_arm_cosmos_db_account.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,28 +213,33 @@ func resourceArmCosmosDBAccount() *schema.Resource {
},

"primary_master_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"secondary_master_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"primary_readonly_master_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"secondary_readonly_master_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"connection_strings": {
Type: schema.TypeList,
Computed: true,
Type: schema.TypeList,
Computed: true,
Sensitive: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Expand Down
20 changes: 12 additions & 8 deletions azurerm/resource_arm_eventhub_authorization_rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,23 +62,27 @@ func resourceArmEventHubAuthorizationRule() *schema.Resource {
},

"primary_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"primary_connection_string": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"secondary_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"secondary_connection_string": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},
},
}
Expand Down
20 changes: 12 additions & 8 deletions azurerm/resource_arm_eventhub_namespace.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,27 @@ func resourceArmEventHubNamespace() *schema.Resource {
},

"default_primary_connection_string": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"default_secondary_connection_string": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"default_primary_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"default_secondary_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"tags": tagsSchema(),
Expand Down
5 changes: 3 additions & 2 deletions azurerm/resource_arm_express_route_circuit.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,9 @@ func resourceArmExpressRouteCircuit() *schema.Resource {
},

"service_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"tags": tagsSchema(),
Expand Down
5 changes: 3 additions & 2 deletions azurerm/resource_arm_express_route_circuit_authorization.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ func resourceArmExpressRouteCircuitAuthorization() *schema.Resource {
},

"authorization_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},

"authorization_use_status": {
Expand Down
5 changes: 3 additions & 2 deletions azurerm/resource_arm_function_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,9 @@ func resourceArmFunctionApp() *schema.Resource {
Required: true,
},
"value": {
Type: schema.TypeString,
Required: true,
Type: schema.TypeString,
Required: true,
Sensitive: true,
},
"type": {
Type: schema.TypeString,
Expand Down
10 changes: 6 additions & 4 deletions azurerm/resource_arm_iothub.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,14 @@ func resourceArmIotHub() *schema.Resource {
Computed: true,
},
"primary_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},
"secondary_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},
"permissions": {
Type: schema.TypeString,
Expand Down
10 changes: 6 additions & 4 deletions azurerm/resource_arm_kubernetes_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,18 @@ func resourceArmKubernetesCluster() *schema.Resource {
Computed: true,
},
"password": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},
"client_certificate": {
Type: schema.TypeString,
Computed: true,
},
"client_key": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},
"cluster_ca_certificate": {
Type: schema.TypeString,
Expand Down
Loading