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.

Sign up for GitHub

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

fix synapse endpoint not available issue in other cloud #9100

Merged
merged 3 commits into from
Nov 5, 2020
Merged

fix synapse endpoint not available issue in other cloud #9100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b799342
fix synapse endpoint not available issue in other cloud
njuCZ Oct 30, 2020
639f160
update
njuCZ Nov 2, 2020
02dc9cb
update
njuCZ Nov 5, 2020
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
14 changes: 11 additions & 3 deletions azurerm/internal/clients/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ package clients
import (
"context"
"fmt"
"log"
"strings"

"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/autorest/azure"
"github.com/hashicorp/go-azure-helpers/authentication"
"github.com/hashicorp/go-azure-helpers/sender"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
Expand Down Expand Up @@ -98,9 +101,14 @@ func Build(ctx context.Context, builder ClientBuilder) (*Client, error) {
}

// Synapse Endpoints
synapseAuth, err := builder.AuthConfig.GetAuthorizationToken(sender, oauthConfig, env.ResourceIdentifiers.Synapse)
if err != nil {
return nil, err
var synapseAuth autorest.Authorizer = nil
if env.ResourceIdentifiers.Synapse != azure.NotAvailable {
synapseAuth, err = builder.AuthConfig.GetAuthorizationToken(sender, oauthConfig, env.ResourceIdentifiers.Synapse)
if err != nil {
return nil, err
}
} else {
log.Printf("[DEBUG] Skipping building the Synapse Authorizer since this is not supported in the current Azure Environment")
}

// Key Vault Endpoints
Expand Down
7 changes: 5 additions & 2 deletions azurerm/internal/services/synapse/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,12 @@ func NewClient(o *common.ClientOptions) *Client {
}
}

func (client Client) AccessControlClient(workspaceName, synapseEndpointSuffix string) *accesscontrol.BaseClient {
func (client Client) AccessControlClient(workspaceName, synapseEndpointSuffix string) (*accesscontrol.BaseClient, error) {
if client.synapseAuthorizer == nil {
return nil, fmt.Errorf("Synapse is not supported in this Azure Environment")
}
endpoint := fmt.Sprintf("https://%s.%s", workspaceName, synapseEndpointSuffix)
accessControlClient := accesscontrol.New(endpoint)
accessControlClient.Client.Authorizer = client.synapseAuthorizer
return &accessControlClient
return &accessControlClient, nil
}
15 changes: 12 additions & 3 deletions azurerm/internal/services/synapse/synapse_role_assignment_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ func resourceArmSynapseRoleAssignmentCreate(d *schema.ResourceData, meta interfa
principalID := d.Get("principal_id").(string)
roleName := d.Get("role_name").(string)

client := synapseClient.AccessControlClient(workspaceId.Name, environment.SynapseEndpointSuffix)
client, err := synapseClient.AccessControlClient(workspaceId.Name, environment.SynapseEndpointSuffix)
if err != nil {
return err
}
roleId, err := getRoleIdByName(ctx, client, roleName)
if err != nil {
return err
Expand Down Expand Up @@ -128,7 +131,10 @@ func resourceArmSynapseRoleAssignmentRead(d *schema.ResourceData, meta interface
return err
}

client := synapseClient.AccessControlClient(id.Workspace.Name, environment.SynapseEndpointSuffix)
client, err := synapseClient.AccessControlClient(id.Workspace.Name, environment.SynapseEndpointSuffix)
if err != nil {
return err
}
resp, err := client.GetRoleAssignmentByID(ctx, id.Id)
if err != nil {
if utils.ResponseWasNotFound(resp.Response) {
Expand Down Expand Up @@ -163,7 +169,10 @@ func resourceArmSynapseRoleAssignmentDelete(d *schema.ResourceData, meta interfa
return err
}

client := synapseClient.AccessControlClient(id.Workspace.Name, environment.SynapseEndpointSuffix)
client, err := synapseClient.AccessControlClient(id.Workspace.Name, environment.SynapseEndpointSuffix)
if err != nil {
return err
}
if _, err := client.DeleteRoleAssignmentByID(ctx, id.Id); err != nil {
return fmt.Errorf("deleting Synapse RoleAssignment %q (workspace %q): %+v", id, id.Workspace.Name, err)
}
Expand Down
10 changes: 8 additions & 2 deletions azurerm/internal/services/synapse/tests/synapse_role_assignment_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ func testCheckAzureRMSynapseRoleAssignmentExists(resourceName string) resource.T
if err != nil {
return err
}
client := synapseClient.AccessControlClient(id.Workspace.Name, environment.SynapseEndpointSuffix)
client, err := synapseClient.AccessControlClient(id.Workspace.Name, environment.SynapseEndpointSuffix)
if err != nil {
return err
}
if resp, err := client.GetRoleAssignmentByID(ctx, id.Id); err != nil {
if !utils.ResponseWasNotFound(resp.Response) {
return fmt.Errorf("bad: Synapse role assignment %q does not exist", id.Id)
Expand Down Expand Up @@ -93,7 +96,10 @@ func testCheckAzureRMSynapseRoleAssignmentDestroy(s *terraform.State) error {
return nil
}

client := synapseClient.AccessControlClient(id.Workspace.Name, environment.SynapseEndpointSuffix)
client, err := synapseClient.AccessControlClient(id.Workspace.Name, environment.SynapseEndpointSuffix)
if err != nil {
return err
}
resp, err := client.GetRoleAssignmentByID(ctx, id.Id)
if err != nil {
if !utils.ResponseWasNotFound(resp.Response) {
Expand Down