public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-06-29 06:42:36 +00:00
Code Issues Projects Releases Wiki Activity

Add import support for org, folder, billing logging sinks (#1860)

Browse Source 
Fixes #1494.

* Add import support for `google_logging_organization_sink`, `google_logging_folder_sink`, `google_logging_billing_account_sink`.

Using `StateFunc` over `DiffSuppressFunc` should only affect tests; for some reason `TestAccLoggingFolderSink_folderAcceptsFullFolderPath` expected a `folder` value of `folders/{{id}}` vs expecting `{{id}}` when only `DiffSuppressFunc` was used, when in real use `DiffSuppressFunc` should be sufficient.
This commit is contained in:
Riley Karson 2018-09-06 08:14:55 -07:00 committed by GitHub
parent 7911cab2e4
commit 035a581b9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 102 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
google/logging_utils.go
View File

@ -7,7 +7,7 @@ import (
// loggingSinkResourceTypes contains all the possible Stackdriver Logging resource types. Used to parse ids safely.
var loggingSinkResourceTypes = []string{
"billingAccount",
"billingAccounts",
"folders",
"organizations",
"projects",

3
google/resource_logging_billing_account_sink.go
View File

@ -12,6 +12,9 @@ func resourceLoggingBillingAccountSink() *schema.Resource {
Delete: resourceLoggingBillingAccountSinkDelete,
Update: resourceLoggingBillingAccountSinkUpdate,
Schema: resourceLoggingSinkSchema(),
Importer: &schema.ResourceImporter{
State: resourceLoggingSinkImportState("billing_account"),
},
}
schm.Schema["billing_account"] = &schema.Schema{
Type: schema.TypeString,

12
google/resource_logging_billing_account_sink_test.go
View File

@ -30,6 +30,10 @@ func TestAccLoggingBillingAccountSink_basic(t *testing.T) {
testAccCheckLoggingBillingAccountSinkExists("google_logging_billing_account_sink.basic", &sink),
testAccCheckLoggingBillingAccountSink(&sink, "google_logging_billing_account_sink.basic"),
),
}, {
ResourceName: "google_logging_billing_account_sink.basic",
ImportState: true,
ImportStateVerify: true,
},
},
})
@ -62,6 +66,10 @@ func TestAccLoggingBillingAccountSink_update(t *testing.T) {
testAccCheckLoggingBillingAccountSinkExists("google_logging_billing_account_sink.update", &sinkAfter),
testAccCheckLoggingBillingAccountSink(&sinkAfter, "google_logging_billing_account_sink.update"),
),
}, {
ResourceName: "google_logging_billing_account_sink.update",
ImportState: true,
ImportStateVerify: true,
},
},
})
@ -96,6 +104,10 @@ func TestAccLoggingBillingAccountSink_heredoc(t *testing.T) {
testAccCheckLoggingBillingAccountSinkExists("google_logging_billing_account_sink.heredoc", &sink),
testAccCheckLoggingBillingAccountSink(&sink, "google_logging_billing_account_sink.heredoc"),
),
}, {
ResourceName: "google_logging_billing_account_sink.heredoc",
ImportState: true,
ImportStateVerify: true,
},
},
})

14
google/resource_logging_folder_sink.go
View File

@ -2,6 +2,7 @@ package google
import (
"fmt"
"strings"
"github.com/hashicorp/terraform/helper/schema"
)
@ -13,12 +14,17 @@ func resourceLoggingFolderSink() *schema.Resource {
Delete: resourceLoggingFolderSinkDelete,
Update: resourceLoggingFolderSinkUpdate,
Schema: resourceLoggingSinkSchema(),
Importer: &schema.ResourceImporter{
State: resourceLoggingSinkImportState("folder"),
},
}
schm.Schema["folder"] = &schema.Schema{
Type: schema.TypeString,
Required: true,
ForceNew: true,
DiffSuppressFunc: optionalPrefixSuppress("folders/"),
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: func(v interface{}) string {
return strings.Replace(v.(string), "folders/", "", 1)
},
}
schm.Schema["include_children"] = &schema.Schema{
Type: schema.TypeBool,

16
google/resource_logging_folder_sink_test.go
View File

@ -32,6 +32,10 @@ func TestAccLoggingFolderSink_basic(t *testing.T) {
testAccCheckLoggingFolderSinkExists("google_logging_folder_sink.basic", &sink),
testAccCheckLoggingFolderSink(&sink, "google_logging_folder_sink.basic"),
),
}, {
ResourceName: "google_logging_folder_sink.basic",
ImportState: true,
ImportStateVerify: true,
},
},
})
@ -58,6 +62,10 @@ func TestAccLoggingFolderSink_folderAcceptsFullFolderPath(t *testing.T) {
testAccCheckLoggingFolderSinkExists("google_logging_folder_sink.basic", &sink),
testAccCheckLoggingFolderSink(&sink, "google_logging_folder_sink.basic"),
),
}, {
ResourceName: "google_logging_folder_sink.basic",
ImportState: true,
ImportStateVerify: true,
},
},
})
@ -92,6 +100,10 @@ func TestAccLoggingFolderSink_update(t *testing.T) {
testAccCheckLoggingFolderSinkExists("google_logging_folder_sink.basic", &sinkAfter),
testAccCheckLoggingFolderSink(&sinkAfter, "google_logging_folder_sink.basic"),
),
}, {
ResourceName: "google_logging_folder_sink.basic",
ImportState: true,
ImportStateVerify: true,
},
},
})
@ -127,6 +139,10 @@ func TestAccLoggingFolderSink_heredoc(t *testing.T) {
testAccCheckLoggingFolderSinkExists("google_logging_folder_sink.heredoc", &sink),
testAccCheckLoggingFolderSink(&sink, "google_logging_folder_sink.heredoc"),
),
}, {
ResourceName: "google_logging_folder_sink.heredoc",
ImportState: true,
ImportStateVerify: true,
},
},
})

13
google/resource_logging_organization_sink.go
View File

@ -2,6 +2,8 @@ package google
import (
"fmt"
"strings"
"github.com/hashicorp/terraform/helper/schema"
)
@ -12,11 +14,16 @@ func resourceLoggingOrganizationSink() *schema.Resource {
Delete: resourceLoggingOrganizationSinkDelete,
Update: resourceLoggingOrganizationSinkUpdate,
Schema: resourceLoggingSinkSchema(),
Importer: &schema.ResourceImporter{
State: resourceLoggingSinkImportState("org_id"),
},
}
schm.Schema["org_id"] = &schema.Schema{
Type: schema.TypeString,
Required: true,
DiffSuppressFunc: optionalPrefixSuppress("organizations/"),
Type: schema.TypeString,
Required: true,
StateFunc: func(v interface{}) string {
return strings.Replace(v.(string), "organizations/", "", 1)
},
}
schm.Schema["include_children"] = &schema.Schema{
Type: schema.TypeBool,

12
google/resource_logging_organization_sink_test.go
View File

@ -31,6 +31,10 @@ func TestAccLoggingOrganizationSink_basic(t *testing.T) {
testAccCheckLoggingOrganizationSinkExists("google_logging_organization_sink.basic", &sink),
testAccCheckLoggingOrganizationSink(&sink, "google_logging_organization_sink.basic"),
),
}, {
ResourceName: "google_logging_organization_sink.basic",
ImportState: true,
ImportStateVerify: true,
},
},
})
@ -63,6 +67,10 @@ func TestAccLoggingOrganizationSink_update(t *testing.T) {
testAccCheckLoggingOrganizationSinkExists("google_logging_organization_sink.update", &sinkAfter),
testAccCheckLoggingOrganizationSink(&sinkAfter, "google_logging_organization_sink.update"),
),
}, {
ResourceName: "google_logging_organization_sink.update",
ImportState: true,
ImportStateVerify: true,
},
},
})
@ -97,6 +105,10 @@ func TestAccLoggingOrganizationSink_heredoc(t *testing.T) {
testAccCheckLoggingOrganizationSinkExists("google_logging_organization_sink.heredoc", &sink),
testAccCheckLoggingOrganizationSink(&sink, "google_logging_organization_sink.heredoc"),
),
}, {
ResourceName: "google_logging_organization_sink.heredoc",
ImportState: true,
ImportStateVerify: true,
},
},
})

17
google/resource_logging_project_sink.go
View File

@ -16,7 +16,7 @@ func resourceLoggingProjectSink() *schema.Resource {
Update: resourceLoggingProjectSinkUpdate,
Schema: resourceLoggingSinkSchema(),
Importer: &schema.ResourceImporter{
State: resourceLoggingProjectSinkImportState,
State: resourceLoggingSinkImportState("project"),
},
}
schm.Schema["project"] = &schema.Schema{
@ -103,18 +103,3 @@ func resourceLoggingProjectSinkDelete(d *schema.ResourceData, meta interface{})
d.SetId("")
return nil
}
func resourceLoggingProjectSinkImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
config := meta.(*Config)
loggingSinkId, err := parseLoggingSinkId(d.Id())
if err != nil {
return nil, err
}
if config.Project != loggingSinkId.resourceId {
d.Set("project", loggingSinkId.resourceId)
}
return []*schema.ResourceData{d}, nil
}

13
google/resource_logging_sink.go
View File

@ -69,3 +69,16 @@ func expandResourceLoggingSinkForUpdate(d *schema.ResourceData) *logging.LogSink
}
return &sink
}
func resourceLoggingSinkImportState(sinkType string) schema.StateFunc {
return func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
loggingSinkId, err := parseLoggingSinkId(d.Id())
if err != nil {
return nil, err
}
d.Set(sinkType, loggingSinkId.resourceId)
return []*schema.ResourceData{d}, nil
}
}

8
website/docs/r/logging_billing_account_sink.html.markdown
View File

@ -69,3 +69,11 @@ exported:
* `writer_identity` - The identity associated with this sink. This identity must be granted write access to the
configured `destination`.
## Import
Billing account logging sinks can be imported using this format:
```
$ terraform import google_logging_billing_account_sink.my_sink billingAccounts/{{billing_account_id}}/sinks/{{sink_id}}
```

8
website/docs/r/logging_folder_sink.html.markdown
View File

@ -79,3 +79,11 @@ exported:
* `writer_identity` - The identity associated with this sink. This identity must be granted write access to the
configured `destination`.
## Import
Folder-level logging sinks can be imported using this format:
```
$ terraform import google_logging_folder_sink.my_sink folders/{{folder_id}}/sinks/{{sink_id}}
```

8
website/docs/r/logging_organization_sink.html.markdown
View File

@ -73,3 +73,11 @@ exported:
* `writer_identity` - The identity associated with this sink. This identity must be granted write access to the
configured `destination`.
## Import
Organization-level logging sinks can be imported using this format:
```
$ terraform import google_logging_organization_sink.my_sink organizations/{{organization_id}}/sinks/{{sink_id}}
```