-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
New Resource: azurerm_api_management_identity_provider_google
#5279
Merged
katbyte
merged 3 commits into
hashicorp:master
from
aqche:resource_azurerm_api_management_identity_provider_google
Jan 2, 2020
Merged
Changes from all commits
Commits
Show all changes
3 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package validate | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "regexp" | ||
| ) | ||
|
|
||
| func GoogleClientID(v interface{}, k string) (warnings []string, errors []error) { | ||
| value := v.(string) | ||
| if !regexp.MustCompile(`^[A-Za-z0-9-]+\.apps\.googleusercontent\.com$`).MatchString(value) { | ||
| errors = append(errors, fmt.Errorf("%s must start with an identifier containing alphanumeric characters and hyphens and end with '.apps.googleusercontent.com'", k)) | ||
| } | ||
| return warnings, errors | ||
| } |
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,41 @@ | ||
| package validate | ||
|
|
||
| import ( | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestGoogleClientID(t *testing.T) { | ||
| cases := []struct { | ||
| Value string | ||
| ErrCount int | ||
| }{ | ||
| { | ||
| Value: "", | ||
| ErrCount: 1, | ||
| }, | ||
| { | ||
| Value: "invalid client id", | ||
| ErrCount: 1, | ||
| }, | ||
| { | ||
| Value: "00000000-0000-0000-0000-000000000000", | ||
| ErrCount: 1, | ||
| }, | ||
| { | ||
| Value: "123456789000-abcd12ef34gh56ij78900klmnopqrst0.apps.googleusercontent.org", | ||
| ErrCount: 1, | ||
| }, | ||
| { | ||
| Value: "123456789000-abcd12ef34gh56ij78900klmnopqrst0.apps.googleusercontent.com", | ||
| ErrCount: 0, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range cases { | ||
| _, errors := GoogleClientID(tc.Value, "client_id") | ||
|
|
||
| if len(errors) != tc.ErrCount { | ||
| t.Fatalf("Expected the Google Client ID %s to trigger a validation error", tc.Value) | ||
| } | ||
| } | ||
| } |
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
159 changes: 159 additions & 0 deletions
159
...m/internal/services/apimanagement/resource_arm_api_management_identity_provider_google.go
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,159 @@ | ||
| package apimanagement | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
| "time" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2018-01-01/apimanagement" | ||
| "github.com/hashicorp/terraform-plugin-sdk/helper/schema" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" | ||
| "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" | ||
| ) | ||
|
|
||
| func resourceArmApiManagementIdentityProviderGoogle() *schema.Resource { | ||
| return &schema.Resource{ | ||
| Create: resourceArmApiManagementIdentityProviderGoogleCreateUpdate, | ||
| Read: resourceArmApiManagementIdentityProviderGoogleRead, | ||
| Update: resourceArmApiManagementIdentityProviderGoogleCreateUpdate, | ||
| Delete: resourceArmApiManagementIdentityProviderGoogleDelete, | ||
| Importer: &schema.ResourceImporter{ | ||
| State: schema.ImportStatePassthrough, | ||
| }, | ||
|
|
||
| Timeouts: &schema.ResourceTimeout{ | ||
| Create: schema.DefaultTimeout(30 * time.Minute), | ||
| Read: schema.DefaultTimeout(5 * time.Minute), | ||
| Update: schema.DefaultTimeout(30 * time.Minute), | ||
| Delete: schema.DefaultTimeout(30 * time.Minute), | ||
| }, | ||
|
|
||
| Schema: map[string]*schema.Schema{ | ||
| "resource_group_name": azure.SchemaResourceGroupName(), | ||
|
|
||
| "api_management_name": azure.SchemaApiManagementName(), | ||
|
|
||
| "client_id": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ValidateFunc: validate.GoogleClientID, | ||
| }, | ||
|
|
||
| "client_secret": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| Sensitive: true, | ||
| ValidateFunc: validate.NoEmptyStrings, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func resourceArmApiManagementIdentityProviderGoogleCreateUpdate(d *schema.ResourceData, meta interface{}) error { | ||
| client := meta.(*clients.Client).ApiManagement.IdentityProviderClient | ||
| ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) | ||
| defer cancel() | ||
|
|
||
| resourceGroup := d.Get("resource_group_name").(string) | ||
| serviceName := d.Get("api_management_name").(string) | ||
| clientID := d.Get("client_id").(string) | ||
| clientSecret := d.Get("client_secret").(string) | ||
|
|
||
| if features.ShouldResourcesBeImported() && d.IsNewResource() { | ||
| existing, err := client.Get(ctx, resourceGroup, serviceName, apimanagement.Google) | ||
| if err != nil { | ||
| if !utils.ResponseWasNotFound(existing.Response) { | ||
| return fmt.Errorf("Error checking for presence of existing Identity Provider %q (API Management Service %q / Resource Group %q): %s", apimanagement.Google, serviceName, resourceGroup, err) | ||
| } | ||
| } | ||
|
|
||
| if existing.ID != nil && *existing.ID != "" { | ||
| return tf.ImportAsExistsError("azurerm_api_management_identity_provider_google", *existing.ID) | ||
| } | ||
| } | ||
|
|
||
| parameters := apimanagement.IdentityProviderContract{ | ||
| IdentityProviderContractProperties: &apimanagement.IdentityProviderContractProperties{ | ||
| ClientID: utils.String(clientID), | ||
| ClientSecret: utils.String(clientSecret), | ||
| Type: apimanagement.Google, | ||
| }, | ||
| } | ||
|
|
||
| if _, err := client.CreateOrUpdate(ctx, resourceGroup, serviceName, apimanagement.Google, parameters, ""); err != nil { | ||
| return fmt.Errorf("Error creating or updating Identity Provider %q (Resource Group %q / API Management Service %q): %+v", apimanagement.Google, resourceGroup, serviceName, err) | ||
| } | ||
|
|
||
| resp, err := client.Get(ctx, resourceGroup, serviceName, apimanagement.Google) | ||
| if err != nil { | ||
| return fmt.Errorf("Error retrieving Identity Provider %q (Resource Group %q / API Management Service %q): %+v", apimanagement.Google, resourceGroup, serviceName, err) | ||
| } | ||
| if resp.ID == nil { | ||
| return fmt.Errorf("Cannot read ID for Identity Provider %q (Resource Group %q / API Management Service %q)", apimanagement.Google, resourceGroup, serviceName) | ||
| } | ||
| d.SetId(*resp.ID) | ||
|
|
||
| return resourceArmApiManagementIdentityProviderGoogleRead(d, meta) | ||
| } | ||
|
|
||
| func resourceArmApiManagementIdentityProviderGoogleRead(d *schema.ResourceData, meta interface{}) error { | ||
| client := meta.(*clients.Client).ApiManagement.IdentityProviderClient | ||
| ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) | ||
| defer cancel() | ||
|
|
||
| id, err := azure.ParseAzureResourceID(d.Id()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| resourceGroup := id.ResourceGroup | ||
| serviceName := id.Path["service"] | ||
| identityProviderName := id.Path["identityProviders"] | ||
|
|
||
| resp, err := client.Get(ctx, resourceGroup, serviceName, apimanagement.IdentityProviderType(identityProviderName)) | ||
| if err != nil { | ||
| if utils.ResponseWasNotFound(resp.Response) { | ||
| log.Printf("[DEBUG] Identity Provider %q (Resource Group %q / API Management Service %q) was not found - removing from state!", identityProviderName, resourceGroup, serviceName) | ||
| d.SetId("") | ||
| return nil | ||
| } | ||
|
|
||
| return fmt.Errorf("Error making Read request for Identity Provider %q (Resource Group %q / API Management Service %q): %+v", identityProviderName, resourceGroup, serviceName, err) | ||
| } | ||
|
|
||
| d.Set("resource_group_name", resourceGroup) | ||
| d.Set("api_management_name", serviceName) | ||
|
|
||
| if props := resp.IdentityProviderContractProperties; props != nil { | ||
| d.Set("client_id", props.ClientID) | ||
| d.Set("client_secret", props.ClientSecret) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func resourceArmApiManagementIdentityProviderGoogleDelete(d *schema.ResourceData, meta interface{}) error { | ||
| client := meta.(*clients.Client).ApiManagement.IdentityProviderClient | ||
| ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) | ||
| defer cancel() | ||
|
|
||
| id, err := azure.ParseAzureResourceID(d.Id()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| resourceGroup := id.ResourceGroup | ||
| serviceName := id.Path["service"] | ||
| identityProviderName := id.Path["identityProviders"] | ||
|
|
||
| if resp, err := client.Delete(ctx, resourceGroup, serviceName, apimanagement.IdentityProviderType(identityProviderName), ""); err != nil { | ||
| if !utils.ResponseWasNotFound(resp) { | ||
| return fmt.Errorf("Error deleting Identity Provider %q (Resource Group %q / API Management Service %q): %+v", identityProviderName, resourceGroup, serviceName, err) | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
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.
Could we change this to match what google calls this:
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.
I believe both Azure and Google actually refer to the value as client secret. I'll update the documentation to reflect this.
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.
If you look at the SDK docs (and presumably the API) it states:
Is this inaccurate and client secret is what you would look for on the google side?
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.
Yep, it is called client secret as well on the Google side.
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.
perfect, thanks for that!