Skip to content

Commit

Permalink
Update aztables to use latest code generator (#21238)
Browse files Browse the repository at this point in the history
* Update aztables to use latest code generator

* fix version number
  • Loading branch information
jhendrixMSFT authored Jul 24, 2023
1 parent 2fd6f78 commit e6de6ab
Show file tree
Hide file tree
Showing 20 changed files with 1,886 additions and 1,554 deletions.
4 changes: 3 additions & 1 deletion sdk/data/aztables/autorest.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ input-file: https://github.com/Azure/azure-rest-api-specs/blob/d744b6bcb95ab4034
license-header: MICROSOFT_MIT_NO_VERSION
clear-output-folder: false
output-folder: internal
file-prefix: "zz_"
tag: package-2019-02
credential-scope: none
use: "@autorest/[email protected].40"
use: "@autorest/[email protected].53"
module-version: 1.0.2
security: "AADToken"
security-scopes: "https://storage.azure.com/.default"
honor-body-placement: true
modelerfour:
group-parameters: false

Expand Down
1 change: 1 addition & 0 deletions sdk/data/aztables/build.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//go:generate autorest ./autorest.md
//go:generate gofmt -w ./internal

// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
Expand Down
7 changes: 3 additions & 4 deletions sdk/data/aztables/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ type Client struct {
service *ServiceClient
cred *SharedKeyCredential
name string
con *generated.Connection
}

// NewClient creates a Client struct in the context of the table specified in the serviceURL, authorizing requests with an Azure AD access token.
Expand Down Expand Up @@ -393,7 +392,7 @@ func (u *UpdateEntityOptions) toGeneratedMergeEntity(m map[string]interface{}) *
return &generated.TableClientMergeEntityOptions{}
}
return &generated.TableClientMergeEntityOptions{
IfMatch: to.Ptr(string(*u.IfMatch)),
IfMatch: (*string)(u.IfMatch),
TableEntityProperties: m,
}
}
Expand All @@ -403,7 +402,7 @@ func (u *UpdateEntityOptions) toGeneratedUpdateEntity(m map[string]interface{})
return &generated.TableClientUpdateEntityOptions{}
}
return &generated.TableClientUpdateEntityOptions{
IfMatch: to.Ptr(string(*u.IfMatch)),
IfMatch: (*string)(u.IfMatch),
TableEntityProperties: m,
}
}
Expand Down Expand Up @@ -710,7 +709,7 @@ func (t Client) GetTableSASURL(permissions SASPermissions, start time.Time, expi
return "", err
}

serviceURL := t.con.Endpoint()
serviceURL := t.client.Endpoint()
if !strings.Contains(serviceURL, "/") {
serviceURL += "/"
}
Expand Down
32 changes: 16 additions & 16 deletions sdk/data/aztables/connection_string_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ func TestConnectionStringParser(t *testing.T) {
require.NotNil(t, client.cred)
require.Equal(t, client.cred.accountName, "dummyaccount")
require.Equal(t, getAccountKey(client.cred), "secretkeykey")
require.True(t, strings.HasPrefix(client.con.Endpoint(), "https://"))
require.True(t, strings.Contains(client.con.Endpoint(), "core.windows.net"))
require.True(t, strings.HasPrefix(client.service.Endpoint(), "https://"))
require.True(t, strings.Contains(client.service.Endpoint(), "core.windows.net"))
}

func TestConnectionStringParserHTTP(t *testing.T) {
Expand All @@ -51,8 +51,8 @@ func TestConnectionStringParserHTTP(t *testing.T) {
require.NotNil(t, client.cred)
require.Equal(t, client.cred.accountName, "dummyaccount")
require.Equal(t, getAccountKey(client.cred), "secretkeykey")
require.True(t, strings.HasPrefix(client.con.Endpoint(), "http://"))
require.True(t, strings.Contains(client.con.Endpoint(), "core.windows.net"))
require.True(t, strings.HasPrefix(client.service.Endpoint(), "http://"))
require.True(t, strings.Contains(client.service.Endpoint(), "core.windows.net"))
}

func TestConnectionStringParserBasic(t *testing.T) {
Expand All @@ -71,8 +71,8 @@ func TestConnectionStringParserBasic(t *testing.T) {
require.NotNil(t, client.cred)
require.Equal(t, client.cred.accountName, "dummyaccount")
require.Equal(t, getAccountKey(client.cred), "secretkeykey")
require.True(t, strings.HasPrefix(client.con.Endpoint(), "https://"))
require.True(t, strings.Contains(client.con.Endpoint(), "core.windows.net"))
require.True(t, strings.HasPrefix(client.service.Endpoint(), "https://"))
require.True(t, strings.Contains(client.service.Endpoint(), "core.windows.net"))
}

func TestConnectionStringParserCustomDomain(t *testing.T) {
Expand All @@ -91,8 +91,8 @@ func TestConnectionStringParserCustomDomain(t *testing.T) {
require.NotNil(t, client.cred)
require.Equal(t, client.cred.accountName, "dummyaccount")
require.Equal(t, getAccountKey(client.cred), "secretkeykey")
require.True(t, strings.HasPrefix(client.con.Endpoint(), "www."))
require.True(t, strings.Contains(client.con.Endpoint(), "mydomain.com"))
require.True(t, strings.HasPrefix(client.service.Endpoint(), "www."))
require.True(t, strings.Contains(client.service.Endpoint(), "mydomain.com"))
}

func TestConnectionStringParserInvalid(t *testing.T) {
Expand Down Expand Up @@ -124,8 +124,8 @@ func TestConnectionStringSAS(t *testing.T) {
client, err := NewServiceClientFromConnectionString(connStr, nil)
require.NoError(t, err)
require.NotNil(t, client)
require.True(t, strings.HasPrefix(client.con.Endpoint(), "https://"))
require.True(t, strings.Contains(client.con.Endpoint(), "core.windows.net"))
require.True(t, strings.HasPrefix(client.service.Endpoint(), "https://"))
require.True(t, strings.Contains(client.service.Endpoint(), "core.windows.net"))
}

func TestConnectionStringCosmos(t *testing.T) {
Expand All @@ -138,8 +138,8 @@ func TestConnectionStringCosmos(t *testing.T) {
client, err := NewServiceClientFromConnectionString(connStr, nil)
require.NoError(t, err)
require.NotNil(t, client)
require.True(t, strings.HasPrefix(client.con.Endpoint(), "https://"))
require.True(t, strings.Contains(client.con.Endpoint(), "cosmos.azure.com:443"))
require.True(t, strings.HasPrefix(client.service.Endpoint(), "https://"))
require.True(t, strings.Contains(client.service.Endpoint(), "cosmos.azure.com:443"))

require.NotNil(t, client.cred)
require.Equal(t, client.cred.accountName, "dummyaccountname")
Expand All @@ -156,8 +156,8 @@ func TestConnectionStringChinaCloud(t *testing.T) {
client, err := NewServiceClientFromConnectionString(connStr, nil)
require.NoError(t, err)
require.NotNil(t, client)
require.True(t, strings.HasPrefix(client.con.Endpoint(), "http://"))
require.True(t, strings.Contains(client.con.Endpoint(), "core.chinacloudapi.cn"))
require.True(t, strings.HasPrefix(client.service.Endpoint(), "http://"))
require.True(t, strings.Contains(client.service.Endpoint(), "core.chinacloudapi.cn"))

require.Equal(t, client.cred.accountName, "dummyaccountname")
require.Equal(t, getAccountKey(client.cred), "secretkeykey")
Expand All @@ -173,8 +173,8 @@ func TestConnectionStringAzurite(t *testing.T) {
client, err := NewServiceClientFromConnectionString(connStr, nil)
require.NoError(t, err)
require.NotNil(t, client)
require.True(t, strings.HasPrefix(client.con.Endpoint(), "http://"))
require.True(t, strings.Contains(client.con.Endpoint(), "http://local-machine:11002/custom/account/path/faketokensignature"))
require.True(t, strings.HasPrefix(client.service.Endpoint(), "http://"))
require.True(t, strings.Contains(client.service.Endpoint(), "http://local-machine:11002/custom/account/path/faketokensignature"))
require.NotNil(t, client.cred)
require.Equal(t, client.cred.accountName, "dummyaccountname")
require.Equal(t, getAccountKey(client.cred), "secretkeykey")
Expand Down
39 changes: 0 additions & 39 deletions sdk/data/aztables/internal/connection.go

This file was deleted.

121 changes: 0 additions & 121 deletions sdk/data/aztables/internal/models_serde.go

This file was deleted.

Loading

0 comments on commit e6de6ab

Please sign in to comment.