-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Add resource_logging_billing_account_sink resource #457
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package google | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "github.com/hashicorp/terraform/helper/schema" | ||
| ) | ||
|
|
||
| func resourceLoggingBillingAccountSink() *schema.Resource { | ||
| schm := &schema.Resource{ | ||
| Create: resourceLoggingBillingAccountSinkCreate, | ||
| Read: resourceLoggingBillingAccountSinkRead, | ||
| Delete: resourceLoggingBillingAccountSinkDelete, | ||
| Update: resourceLoggingBillingAccountSinkUpdate, | ||
| Schema: resourceLoggingSinkSchema(), | ||
| } | ||
| schm.Schema["billing_account"] = &schema.Schema{ | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| } | ||
| return schm | ||
| } | ||
|
|
||
| func resourceLoggingBillingAccountSinkCreate(d *schema.ResourceData, meta interface{}) error { | ||
| config := meta.(*Config) | ||
|
|
||
| id, sink := expandResourceLoggingSink(d, "billingAccounts", d.Get("billing_account").(string)) | ||
|
|
||
| // The API will reject any requests that don't explicitly set 'uniqueWriterIdentity' to true. | ||
| _, err := config.clientLogging.BillingAccounts.Sinks.Create(id.parent(), sink).UniqueWriterIdentity(true).Do() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| d.SetId(id.canonicalId()) | ||
| return resourceLoggingBillingAccountSinkRead(d, meta) | ||
| } | ||
|
|
||
| func resourceLoggingBillingAccountSinkRead(d *schema.ResourceData, meta interface{}) error { | ||
| config := meta.(*Config) | ||
|
|
||
| sink, err := config.clientLogging.BillingAccounts.Sinks.Get(d.Id()).Do() | ||
| if err != nil { | ||
| return handleNotFoundError(err, d, fmt.Sprintf("Billing Logging Sink %s", d.Get("name").(string))) | ||
| } | ||
|
|
||
| flattenResourceLoggingSink(d, sink) | ||
| return nil | ||
|
|
||
| } | ||
|
|
||
| func resourceLoggingBillingAccountSinkUpdate(d *schema.ResourceData, meta interface{}) error { | ||
| config := meta.(*Config) | ||
|
|
||
| sink := expandResourceloggingSinkForUpdate(d) | ||
|
|
||
| // The API will reject any requests that don't explicitly set 'uniqueWriterIdentity' to true. | ||
| _, err := config.clientLogging.BillingAccounts.Sinks.Patch(d.Id(), sink).UniqueWriterIdentity(true).Do() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return resourceLoggingBillingAccountSinkRead(d, meta) | ||
| } | ||
|
|
||
| func resourceLoggingBillingAccountSinkDelete(d *schema.ResourceData, meta interface{}) error { | ||
| config := meta.(*Config) | ||
|
|
||
| _, err := config.clientLogging.Projects.Sinks.Delete(d.Id()).Do() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| package google | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "testing" | ||
|
|
||
| "github.com/hashicorp/terraform/helper/acctest" | ||
| "github.com/hashicorp/terraform/helper/resource" | ||
| "github.com/hashicorp/terraform/terraform" | ||
| "google.golang.org/api/logging/v2" | ||
| ) | ||
|
|
||
| func TestAccLoggingBillingAccountSink_basic(t *testing.T) { | ||
| skipIfEnvNotSet(t, "GOOGLE_BILLING_ACCOUNT") | ||
|
|
||
| sinkName := "tf-test-sink-" + acctest.RandString(10) | ||
| bucketName := "tf-test-sink-bucket-" + acctest.RandString(10) | ||
| billingAccount := os.Getenv("GOOGLE_BILLING_ACCOUNT") | ||
|
|
||
| var sink logging.LogSink | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testAccCheckLoggingBillingAccountSinkDestroy, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: testAccLoggingBillingAccountSink_basic(sinkName, bucketName, billingAccount), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckLoggingBillingAccountSinkExists("google_logging_billing_account_sink.basic", &sink), | ||
| testAccCheckLoggingBillingAccountSink(&sink, "google_logging_billing_account_sink.basic"), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccLoggingBillingAccountSink_update(t *testing.T) { | ||
| skipIfEnvNotSet(t, "GOOGLE_BILLING_ACCOUNT") | ||
|
|
||
| sinkName := "tf-test-sink-" + acctest.RandString(10) | ||
| bucketName := "tf-test-sink-bucket-" + acctest.RandString(10) | ||
| updatedBucketName := "tf-test-sink-bucket-" + acctest.RandString(10) | ||
| billingAccount := os.Getenv("GOOGLE_BILLING_ACCOUNT") | ||
|
|
||
| var sinkBefore, sinkAfter logging.LogSink | ||
|
|
||
| resource.Test(t, resource.TestCase{ | ||
| PreCheck: func() { testAccPreCheck(t) }, | ||
| Providers: testAccProviders, | ||
| CheckDestroy: testAccCheckLoggingBillingAccountSinkDestroy, | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: testAccLoggingBillingAccountSink_update(sinkName, bucketName, billingAccount), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckLoggingBillingAccountSinkExists("google_logging_billing_account_sink.update", &sinkBefore), | ||
| testAccCheckLoggingBillingAccountSink(&sinkBefore, "google_logging_billing_account_sink.update"), | ||
| ), | ||
| }, { | ||
| Config: testAccLoggingBillingAccountSink_update(sinkName, updatedBucketName, billingAccount), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckLoggingBillingAccountSinkExists("google_logging_billing_account_sink.update", &sinkAfter), | ||
| testAccCheckLoggingBillingAccountSink(&sinkAfter, "google_logging_billing_account_sink.update"), | ||
| ), | ||
| }, | ||
| }, | ||
| }) | ||
|
|
||
| // Destination should have changed, but WriterIdentity should be the same | ||
| if sinkBefore.Destination == sinkAfter.Destination { | ||
| t.Errorf("Expected Destination to change, but it didn't: Destination = %#v", sinkBefore.Destination) | ||
| } | ||
| if sinkBefore.WriterIdentity != sinkAfter.WriterIdentity { | ||
| t.Errorf("Expected WriterIdentity to be the same, but it differs: before = %#v, after = %#v", | ||
| sinkBefore.WriterIdentity, sinkAfter.WriterIdentity) | ||
| } | ||
| } | ||
|
|
||
| func testAccCheckLoggingBillingAccountSinkDestroy(s *terraform.State) error { | ||
| config := testAccProvider.Meta().(*Config) | ||
|
|
||
| for _, rs := range s.RootModule().Resources { | ||
| if rs.Type != "google_logging_billing_account_sink" { | ||
| continue | ||
| } | ||
|
|
||
| attributes := rs.Primary.Attributes | ||
|
|
||
| _, err := config.clientLogging.BillingAccounts.Sinks.Get(attributes["id"]).Do() | ||
| if err == nil { | ||
| return fmt.Errorf("billing sink still exists") | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func testAccCheckLoggingBillingAccountSinkExists(n string, sink *logging.LogSink) resource.TestCheckFunc { | ||
| return func(s *terraform.State) error { | ||
| attributes, err := getResourceAttributes(n, s) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| config := testAccProvider.Meta().(*Config) | ||
|
|
||
| si, err := config.clientLogging.BillingAccounts.Sinks.Get(attributes["id"]).Do() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| *sink = *si | ||
|
|
||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func testAccCheckLoggingBillingAccountSink(sink *logging.LogSink, n string) resource.TestCheckFunc { | ||
| return func(s *terraform.State) error { | ||
| attributes, err := getResourceAttributes(n, s) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if sink.Destination != attributes["destination"] { | ||
| return fmt.Errorf("mismatch on destination: api has %s but client has %s", sink.Destination, attributes["destination"]) | ||
| } | ||
|
|
||
| if sink.Filter != attributes["filter"] { | ||
| return fmt.Errorf("mismatch on filter: api has %s but client has %s", sink.Filter, attributes["filter"]) | ||
| } | ||
|
|
||
| if sink.WriterIdentity != attributes["writer_identity"] { | ||
| return fmt.Errorf("mismatch on writer_identity: api has %s but client has %s", sink.WriterIdentity, attributes["writer_identity"]) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func testAccLoggingBillingAccountSink_basic(name, bucketName, billingAccount string) string { | ||
| return fmt.Sprintf(` | ||
| resource "google_logging_billing_account_sink" "basic" { | ||
| name = "%s" | ||
| billing_account = "%s" | ||
| destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}" | ||
| filter = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR" | ||
| } | ||
|
|
||
| resource "google_storage_bucket" "log-bucket" { | ||
| name = "%s" | ||
| }`, name, billingAccount, getTestProjectFromEnv(), bucketName) | ||
| } | ||
|
|
||
| func testAccLoggingBillingAccountSink_update(name, bucketName, billingAccount string) string { | ||
| return fmt.Sprintf(` | ||
| resource "google_logging_billing_account_sink" "update" { | ||
| name = "%s" | ||
| billing_account = "%s" | ||
| destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}" | ||
| filter = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR" | ||
| } | ||
|
|
||
| resource "google_storage_bucket" "log-bucket" { | ||
| name = "%s" | ||
| }`, name, billingAccount, getTestProjectFromEnv(), bucketName) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Import support? You have all the context you need fresh in your mind. Since this PR is long, I think it is a good idea to do it in a separate PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed! I actually started adding that but stopped as it got pretty complicated. My approach was modeled on yours