Skip to content

Commit

Permalink
Stored info (#3922) (#7145)
Browse files Browse the repository at this point in the history
* Add stored info

* Finish stored info, fix shared import

* Add tests for dictionary, large custom dictionary, txt fixture, async on create for custom dictionary pending status

* Add force destroy to bucket

* Copy/paste errors

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician authored Aug 28, 2020
1 parent becb678 commit 3f1ad63
Show file tree
Hide file tree
Showing 11 changed files with 1,724 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .changelog/3922.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
google_data_loss_prevention_stored_info_type
```
5 changes: 3 additions & 2 deletions google/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -634,9 +634,9 @@ func Provider() terraform.ResourceProvider {
return provider
}

// Generated resources: 157
// Generated resources: 158
// Generated IAM resources: 69
// Total generated resources: 226
// Total generated resources: 227
func ResourceMap() map[string]*schema.Resource {
resourceMap, _ := ResourceMapWithErrors()
return resourceMap
Expand Down Expand Up @@ -770,6 +770,7 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
"google_data_catalog_tag": resourceDataCatalogTag(),
"google_data_loss_prevention_job_trigger": resourceDataLossPreventionJobTrigger(),
"google_data_loss_prevention_inspect_template": resourceDataLossPreventionInspectTemplate(),
"google_data_loss_prevention_stored_info_type": resourceDataLossPreventionStoredInfoType(),
"google_dataproc_autoscaling_policy": resourceDataprocAutoscalingPolicy(),
"google_datastore_index": resourceDatastoreIndex(),
"google_deployment_manager_deployment": resourceDeploymentManagerDeployment(),
Expand Down
4 changes: 2 additions & 2 deletions google/resource_data_loss_prevention_inspect_template.go
Original file line number Diff line number Diff line change
Expand Up @@ -618,9 +618,9 @@ func resourceDataLossPreventionInspectTemplateImport(d *schema.ResourceData, met
} else if len(parts) == 4 {
d.Set("name", parts[3])
} else {
return nil, fmt.Errorf("Unexpected import id: %s, expected form {{parent}}/inspectTemplates/{{name}}", d.Get("name").(string))
return nil, fmt.Errorf("Unexpected import id: %s, expected form {{parent}}/inspectTemplate/{{name}}", d.Get("name").(string))
}
// Remove "/inspectTemplates/{{name}}" from the id
// Remove "/inspectTemplate/{{name}}" from the id
parts = parts[:len(parts)-2]
d.Set("parent", strings.Join(parts, "/"))

Expand Down
4 changes: 2 additions & 2 deletions google/resource_data_loss_prevention_job_trigger.go
Original file line number Diff line number Diff line change
Expand Up @@ -689,9 +689,9 @@ func resourceDataLossPreventionJobTriggerImport(d *schema.ResourceData, meta int
} else if len(parts) == 4 {
d.Set("name", parts[3])
} else {
return nil, fmt.Errorf("Unexpected import id: %s, expected form {{parent}}/jobTriggers/{{name}}", d.Get("name").(string))
return nil, fmt.Errorf("Unexpected import id: %s, expected form {{parent}}/jobTrigger/{{name}}", d.Get("name").(string))
}
// Remove "/jobTriggers/{{name}}" from the id
// Remove "/jobTrigger/{{name}}" from the id
parts = parts[:len(parts)-2]
d.Set("parent", strings.Join(parts, "/"))

Expand Down
Loading

0 comments on commit 3f1ad63

Please sign in to comment.