Skip to content

Commit a69f651

Browse files
oxtoacartoxtoacart
committed
rename package tsclient to tailscale
Updates tailscale/corp#22748 Signed-off-by: Percy Wegmann <[email protected]>
1 parent 18aaea2 commit a69f651

26 files changed

+183
-194
lines changed

‎v2/README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright (c) David Bond, Tailscale Inc, & Contributors
22
// SPDX-License-Identifier: MIT
33

4-
# tailscale-client-go/v2
4+
# tailscale.com/client/tailscale/v2
55

6-
[![Go Reference](https://pkg.go.dev/badge/github.com/tailscale/tailscale-client-go/v2.svg)](https://pkg.go.dev/github.com/tailscale/tailscale-client-go/v2)
7-
[![Go Report Card](https://goreportcard.com/badge/github.com/tailscale/tailscale-client-go/v2)](https://goreportcard.com/report/github.com/tailscale/tailscale-client-go/v2)
8-
![Github Actions](https://github.com/tailscale/tailscale-client-go/actions/workflows/ci.yml/badge.svg?branch=main)
6+
[![Go Reference](https://pkg.go.dev/badge/tailscale.com/client/tailscale/v2.svg)](https://pkg.go.dev/tailscale.com/client/tailscale/v2)
7+
[![Go Report Card](https://goreportcard.com/badge/tailscale.com/client/tailscale/v2)](https://goreportcard.com/report/tailscale.com/client/tailscale/v2)
8+
![Github Actions](https://github.com/tailscale/client/actions/workflows/ci.yml/badge.svg?branch=main)
99

1010
A client implementation for the [Tailscale](https://tailscale.com) HTTP API.
1111
For more details, please see [API documentation](https://tailscale.com/api).
@@ -19,11 +19,11 @@ import (
1919
"context"
2020
"os"
2121

22-
tsclient "github.com/tailscale/tailscale-client-go/v2"
22+
"tailscale.com/client/tailscale/v2"
2323
)
2424

2525
func main() {
26-
client := &tsclient.Client{
26+
client := &tailscale.Client{
2727
Tailnet: os.Getenv("TAILSCALE_TAILNET"),
2828
APIKey: os.Getenv("TAILSCALE_API_KEY"),
2929
}
@@ -41,13 +41,13 @@ import (
4141
"context"
4242
"os"
4343

44-
tsclient "github.com/tailscale/tailscale-client-go/v2"
44+
"tailscale.com/client/tailscale/v2"
4545
)
4646

4747
func main() {
48-
client := &tsclient.Client{
48+
client := &tailscale.Client{
4949
Tailnet: os.Getenv("TAILSCALE_TAILNET"),
50-
HTTP: tsclient.OAuthConfig{
50+
HTTP: tailscale.OAuthConfig{
5151
ClientID: os.Getenv("TAILSCALE_OAUTH_CLIENT_ID"),
5252
ClientSecret: os.Getenv("TAILSCALE_OAUTH_CLIENT_SECRET"),
5353
Scopes: []string{"all:write"},

‎v2/client.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Copyright (c) David Bond, Tailscale Inc, & Contributors
22
// SPDX-License-Identifier: MIT
33

4-
// Package tsclient contains a basic implementation of a client for the Tailscale HTTP API.
4+
// package tailscale contains a basic implementation of a client for the Tailscale HTTP API.
55
//
66
// Documentation is at https://tailscale.com/api
7-
package tsclient
7+
package tailscale
88

99
import (
1010
"bytes"

‎v2/client_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) David Bond, Tailscale Inc, & Contributors
22
// SPDX-License-Identifier: MIT
33

4-
package tsclient
4+
package tailscale
55

66
import (
77
_ "embed"

‎v2/contacts.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) David Bond, Tailscale Inc, & Contributors
22
// SPDX-License-Identifier: MIT
33

4-
package tsclient
4+
package tailscale
55

66
import (
77
"context"

‎v2/contacts_test.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) David Bond, Tailscale Inc, & Contributors
22
// SPDX-License-Identifier: MIT
33

4-
package tsclient_test
4+
package tailscale
55

66
import (
77
"context"
@@ -10,7 +10,6 @@ import (
1010
"testing"
1111

1212
"github.com/stretchr/testify/assert"
13-
tsclient "github.com/tailscale/tailscale-client-go/v2"
1413
)
1514

1615
func TestClient_Contacts(t *testing.T) {
@@ -19,17 +18,17 @@ func TestClient_Contacts(t *testing.T) {
1918
client, server := NewTestHarness(t)
2019
server.ResponseCode = http.StatusOK
2120

22-
expectedContacts := &tsclient.Contacts{
23-
Account: tsclient.Contact{
21+
expectedContacts := &Contacts{
22+
Account: Contact{
2423
Email: "[email protected]",
2524
FallbackEmail: "[email protected]",
2625
NeedsVerification: false,
2726
},
28-
Support: tsclient.Contact{
27+
Support: Contact{
2928
Email: "[email protected]",
3029
NeedsVerification: false,
3130
},
32-
Security: tsclient.Contact{
31+
Security: Contact{
3332
Email: "[email protected]",
3433
FallbackEmail: "[email protected]",
3534
NeedsVerification: true,
@@ -52,14 +51,14 @@ func TestClient_UpdateContact(t *testing.T) {
5251
server.ResponseBody = nil
5352

5453
email := "[email protected]"
55-
updateRequest := tsclient.UpdateContactRequest{
54+
updateRequest := UpdateContactRequest{
5655
Email: &email,
5756
}
58-
err := client.Contacts().Update(context.Background(), tsclient.ContactAccount, updateRequest)
57+
err := client.Contacts().Update(context.Background(), ContactAccount, updateRequest)
5958
assert.NoError(t, err)
6059
assert.Equal(t, http.MethodPatch, server.Method)
6160
assert.Equal(t, "/api/v2/tailnet/example.com/contacts/account", server.Path)
62-
var receivedRequest tsclient.UpdateContactRequest
61+
var receivedRequest UpdateContactRequest
6362
err = json.Unmarshal(server.Body.Bytes(), &receivedRequest)
6463
assert.NoError(t, err)
6564
assert.EqualValues(t, updateRequest, receivedRequest)

‎v2/device_posture.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) David Bond, Tailscale Inc, & Contributors
22
// SPDX-License-Identifier: MIT
33

4-
package tsclient
4+
package tailscale
55

66
import (
77
"context"

‎v2/device_posture_test.go‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) David Bond, Tailscale Inc, & Contributors
22
// SPDX-License-Identifier: MIT
33

4-
package tsclient_test
4+
package tailscale
55

66
import (
77
"context"
@@ -11,7 +11,6 @@ import (
1111

1212
"github.com/stretchr/testify/assert"
1313
"github.com/stretchr/testify/require"
14-
tsclient "github.com/tailscale/tailscale-client-go/v2"
1514
)
1615

1716
func TestClient_DevicePosture_CreateIntegration(t *testing.T) {
@@ -20,17 +19,17 @@ func TestClient_DevicePosture_CreateIntegration(t *testing.T) {
2019
client, server := NewTestHarness(t)
2120
server.ResponseCode = http.StatusOK
2221

23-
req := tsclient.CreatePostureIntegrationRequest{
24-
Provider: tsclient.PostureIntegrationProviderIntune,
22+
req := CreatePostureIntegrationRequest{
23+
Provider: PostureIntegrationProviderIntune,
2524
CloudID: "cloudid",
2625
ClientID: "clientid",
2726
TenantID: "tenantid",
2827
ClientSecret: "clientsecret",
2928
}
3029

31-
resp := &tsclient.PostureIntegration{
30+
resp := &PostureIntegration{
3231
ID: "1",
33-
Provider: tsclient.PostureIntegrationProviderIntune,
32+
Provider: PostureIntegrationProviderIntune,
3433
CloudID: "cloudid",
3534
ClientID: "clientid",
3635
TenantID: "tenantid",
@@ -43,7 +42,7 @@ func TestClient_DevicePosture_CreateIntegration(t *testing.T) {
4342
assert.Equal(t, "/api/v2/tailnet/example.com/posture/integrations", server.Path)
4443
assert.Equal(t, resp, integration)
4544

46-
var actualRequest tsclient.CreatePostureIntegrationRequest
45+
var actualRequest CreatePostureIntegrationRequest
4746
err = json.Unmarshal(server.Body.Bytes(), &actualRequest)
4847
require.NoError(t, err)
4948
assert.Equal(t, req, actualRequest)
@@ -55,16 +54,16 @@ func TestClient_DevicePosture_UpdateIntegration(t *testing.T) {
5554
client, server := NewTestHarness(t)
5655
server.ResponseCode = http.StatusOK
5756

58-
req := tsclient.UpdatePostureIntegrationRequest{
57+
req := UpdatePostureIntegrationRequest{
5958
CloudID: "cloudid",
6059
ClientID: "clientid",
6160
TenantID: "tenantid",
62-
ClientSecret: tsclient.PointerTo("clientsecret"),
61+
ClientSecret: PointerTo("clientsecret"),
6362
}
6463

65-
resp := &tsclient.PostureIntegration{
64+
resp := &PostureIntegration{
6665
ID: "1",
67-
Provider: tsclient.PostureIntegrationProviderIntune,
66+
Provider: PostureIntegrationProviderIntune,
6867
CloudID: "cloudid",
6968
ClientID: "clientid",
7069
TenantID: "tenantid",
@@ -77,7 +76,7 @@ func TestClient_DevicePosture_UpdateIntegration(t *testing.T) {
7776
assert.Equal(t, "/api/v2/posture/integrations/1", server.Path)
7877
assert.Equal(t, resp, actualResp)
7978

80-
var actualRequest tsclient.UpdatePostureIntegrationRequest
79+
var actualRequest UpdatePostureIntegrationRequest
8180
err = json.Unmarshal(server.Body.Bytes(), &actualRequest)
8281
require.NoError(t, err)
8382
assert.Equal(t, req, actualRequest)
@@ -101,9 +100,9 @@ func TestClient_DevicePosture_GetIntegration(t *testing.T) {
101100
client, server := NewTestHarness(t)
102101
server.ResponseCode = http.StatusOK
103102

104-
resp := &tsclient.PostureIntegration{
103+
resp := &PostureIntegration{
105104
ID: "1",
106-
Provider: tsclient.PostureIntegrationProviderIntune,
105+
Provider: PostureIntegrationProviderIntune,
107106
CloudID: "cloudid1",
108107
ClientID: "clientid1",
109108
TenantID: "tenantid1",
@@ -123,23 +122,23 @@ func TestClient_DevicePosture_ListIntegrations(t *testing.T) {
123122
client, server := NewTestHarness(t)
124123
server.ResponseCode = http.StatusOK
125124

126-
resp := []tsclient.PostureIntegration{
125+
resp := []PostureIntegration{
127126
{
128127
ID: "1",
129-
Provider: tsclient.PostureIntegrationProviderIntune,
128+
Provider: PostureIntegrationProviderIntune,
130129
CloudID: "cloudid1",
131130
ClientID: "clientid1",
132131
TenantID: "tenantid1",
133132
},
134133
{
135134
ID: "2",
136-
Provider: tsclient.PostureIntegrationProviderJamfPro,
135+
Provider: PostureIntegrationProviderJamfPro,
137136
CloudID: "cloudid2",
138137
ClientID: "clientid2",
139138
TenantID: "tenantid2",
140139
},
141140
}
142-
server.ResponseBody = map[string][]tsclient.PostureIntegration{
141+
server.ResponseBody = map[string][]PostureIntegration{
143142
"integrations": resp,
144143
}
145144

‎v2/devices.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) David Bond, Tailscale Inc, & Contributors
22
// SPDX-License-Identifier: MIT
33

4-
package tsclient
4+
package tailscale
55

66
import (
77
"context"

0 commit comments

Comments
 (0)