Skip to content

Commit 53acb0d

Browse files
feat: add auth with JWT (#142)
* feat: add auth with JWT * feat: add auth with JWT * feat: add auth with JWT - fix tests
1 parent 7afe765 commit 53acb0d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+468
-247
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ import (
169169
)
170170

171171
apiToken := os.Getenv("MGC_API_TOKEN")
172-
c := client.NewMgcClient(apiToken)
172+
c := client.NewMgcClient(client.WithAPIKey(apiToken))
173173

174174
accessKey := os.Getenv("MGC_OBJECT_STORAGE_ACCESS_KEY")
175175
secretKey := os.Getenv("MGC_OBJECT_STORAGE_SECRET_KEY")
@@ -452,7 +452,7 @@ import (
452452
)
453453

454454
apiToken := os.Getenv("MGC_API_TOKEN")
455-
c := client.NewMgcClient(apiToken)
455+
c := client.NewMgcClient(client.WithAPIKey(apiToken))
456456
computeClient := compute.New(c)
457457
```
458458

audit/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
func newTestCoreClient() *client.CoreClient {
1212
httpClient := &http.Client{}
13-
return client.NewMgcClient("test-api",
13+
return client.NewMgcClient(client.WithAPIKey("test-api-key"),
1414
client.WithBaseURL(client.MgcUrl("http://test-api.com")),
1515
client.WithHTTPClient(httpClient))
1616
}

audit/events_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestEventService_List(t *testing.T) {
3333
defer ts.Close()
3434

3535
// Configure client with test server URL
36-
cfg := client.NewMgcClient("test-api-key",
36+
cfg := client.NewMgcClient(client.WithAPIKey("test-api-key"),
3737
client.WithBaseURL(client.MgcUrl(ts.URL)),
3838
client.WithTimeout(20*time.Second),
3939
)
@@ -101,7 +101,7 @@ func TestEventService_List(t *testing.T) {
101101
}))
102102
defer errorTS.Close()
103103

104-
cfg := client.NewMgcClient("test-api-key",
104+
cfg := client.NewMgcClient(client.WithAPIKey("test-api-key"),
105105
client.WithBaseURL(client.MgcUrl(errorTS.URL)),
106106
client.WithTimeout(10*time.Second),
107107
)
@@ -250,7 +250,7 @@ func TestEventService_ListAll(t *testing.T) {
250250
}))
251251
defer ts.Close()
252252

253-
cfg := client.NewMgcClient("test-api-key",
253+
cfg := client.NewMgcClient(client.WithAPIKey("test-api-key"),
254254
client.WithBaseURL(client.MgcUrl(ts.URL)),
255255
client.WithTimeout(20*time.Second),
256256
)

audit/types_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestEventTypeService(t *testing.T) {
3232
defer ts.Close()
3333

3434
// Configure client with test server URL
35-
cfg := client.NewMgcClient("test-api-key",
35+
cfg := client.NewMgcClient(client.WithAPIKey("test-api-key"),
3636
client.WithBaseURL(client.MgcUrl(ts.URL)),
3737
client.WithTimeout(20*time.Second),
3838
)
@@ -89,7 +89,7 @@ func TestEventTypeService(t *testing.T) {
8989
}))
9090
defer errorTs.Close()
9191

92-
cfg := client.NewMgcClient("test-api-key",
92+
cfg := client.NewMgcClient(client.WithAPIKey("test-api-key"),
9393
client.WithBaseURL(client.MgcUrl(errorTs.URL)),
9494
client.WithTimeout(10*time.Second),
9595
)
@@ -234,7 +234,7 @@ func TestEventTypeService_ListAll(t *testing.T) {
234234
}))
235235
defer ts.Close()
236236

237-
cfg := client.NewMgcClient("test-api-key",
237+
cfg := client.NewMgcClient(client.WithAPIKey("test-api-key"),
238238
client.WithBaseURL(client.MgcUrl(ts.URL)),
239239
client.WithTimeout(20*time.Second),
240240
)

availabilityzones/az_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestService(t *testing.T) {
3333
}))
3434
defer ts.Close()
3535

36-
cfg := client.NewMgcClient("test-api-key",
36+
cfg := client.NewMgcClient(client.WithAPIKey("test-api-key"),
3737
client.WithTimeout(20*time.Second),
3838
)
3939
c := New(cfg, WithGlobalBasePath(client.MgcUrl(ts.URL)))
@@ -69,7 +69,7 @@ func TestService(t *testing.T) {
6969
}))
7070
defer ts.Close()
7171

72-
cfg := client.NewMgcClient("test-api-key",
72+
cfg := client.NewMgcClient(client.WithAPIKey("test-api-key"),
7373
client.WithTimeout(20*time.Second),
7474
)
7575
c := New(cfg, WithGlobalBasePath(client.MgcUrl(ts.URL)))
@@ -111,7 +111,7 @@ func TestService(t *testing.T) {
111111
}))
112112
defer ts.Close()
113113

114-
cfg := client.NewMgcClient("test-api-key",
114+
cfg := client.NewMgcClient(client.WithAPIKey("test-api-key"),
115115
client.WithTimeout(20*time.Second),
116116
)
117117
c := New(cfg, WithGlobalBasePath(client.MgcUrl(ts.URL)))
@@ -150,7 +150,7 @@ func TestService(t *testing.T) {
150150
}))
151151
defer ts.Close()
152152

153-
cfg := client.NewMgcClient("test-api-key",
153+
cfg := client.NewMgcClient(client.WithAPIKey("test-api-key"),
154154
client.WithTimeout(20*time.Second),
155155
)
156156
c := New(cfg, WithGlobalBasePath(client.MgcUrl(ts.URL)))
@@ -172,7 +172,7 @@ func TestService(t *testing.T) {
172172
}))
173173
defer ts.Close()
174174

175-
cfg := client.NewMgcClient("test-api-key",
175+
cfg := client.NewMgcClient(client.WithAPIKey("test-api-key"),
176176
client.WithTimeout(1*time.Millisecond), // Very short timeout to trigger error
177177
)
178178
c := New(cfg, WithGlobalBasePath(client.MgcUrl(ts.URL)))

availabilityzones/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
func newTestCoreClient() *client.CoreClient {
1212
httpClient := &http.Client{}
13-
return client.NewMgcClient("test-api",
13+
return client.NewMgcClient(client.WithAPIKey("test-api-key"),
1414
client.WithBaseURL(client.MgcUrl("http://test-api.com")),
1515
client.WithHTTPClient(httpClient))
1616
}

blockstorage/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
func newTestCoreClient() *client.CoreClient {
1212
httpClient := &http.Client{}
13-
return client.NewMgcClient("test-api",
13+
return client.NewMgcClient(client.WithAPIKey("test-api-key"),
1414
client.WithBaseURL(client.MgcUrl("http://test-api.com")),
1515
client.WithHTTPClient(httpClient))
1616
}

blockstorage/schedulers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ func TestSchedulerService_ListAll_NewRequestError(t *testing.T) {
943943

944944
func testSchedulerClient(baseURL string) SchedulerService {
945945
httpClient := &http.Client{}
946-
core := client.NewMgcClient("test-api",
946+
core := client.NewMgcClient(client.WithAPIKey("test-api-key"),
947947
client.WithBaseURL(client.MgcUrl(baseURL)),
948948
client.WithHTTPClient(httpClient))
949949
return New(core).Schedulers()

blockstorage/snapshots_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ func TestSnapshotService_ListAll_NewRequestError(t *testing.T) {
584584

585585
func testClientSnaphots(baseURL string) SnapshotService {
586586
httpClient := &http.Client{}
587-
core := client.NewMgcClient("test-api",
587+
core := client.NewMgcClient(client.WithAPIKey("test-api-key"),
588588
client.WithBaseURL(client.MgcUrl(baseURL)),
589589
client.WithHTTPClient(httpClient))
590590
return New(core).Snapshots()

blockstorage/volume_types_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ func TestVolumeTypeService_ListAll_WithFilters(t *testing.T) {
483483

484484
func testClientTypes(baseURL string) VolumeTypeService {
485485
httpClient := &http.Client{}
486-
core := client.NewMgcClient("test-api",
486+
core := client.NewMgcClient(client.WithAPIKey("test-api-key"),
487487
client.WithBaseURL(client.MgcUrl(baseURL)),
488488
client.WithHTTPClient(httpClient))
489489
return New(core).VolumeTypes()

0 commit comments

Comments
 (0)