Skip to content

Commit d13a690

Browse files
committed
chore: limit most classic-environment calls to apiToken only
BREAKING CHANGE: Updated all environment classic service implementations to use rest.APITokenClient instead of rest.HybridClient for API requests. This change standardizes client usage and removes support for platform requests for most classic-environment endpoints, retaining only settings-related paths.
1 parent 7aa1ce3 commit d13a690

File tree

20 files changed

+50
-64
lines changed

20 files changed

+50
-64
lines changed

dynatrace/api/builtin/host/monitoring/mode/service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func Service(credentials *rest.Credentials) settings.CRUDService[*mode.Settings]
4444
return &service{
4545
service: settings20.Service[*mode.Settings](credentials, SchemaID, SchemaVersion),
4646
credentials: credentials,
47-
client: rest.HybridClient(credentials),
47+
client: rest.APITokenClient(credentials),
4848
}
4949
}
5050

dynatrace/api/builtin/monitoring/slo/service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ func (me *service) get(ctx context.Context, id string, v *slo.Settings) error {
175175

176176
slo := new(sloGet)
177177

178-
client := rest.HybridClient(me.credentials)
178+
client := rest.APITokenClient(me.credentials)
179179
req := client.Get(ctx, fmt.Sprintf("/api/v2/slo/%s", url.PathEscape(legacyId)), 200)
180180
if err := req.Finish(slo); err != nil {
181181
return err

dynatrace/api/v1/config/customtags/service.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type service struct {
4646
var entityIdSelectorRegexp = regexp.MustCompile("entityId\\((.*)\\)")
4747

4848
func (me *service) Get(ctx context.Context, selector string, v *customtags.Settings) (err error) {
49-
client := rest.HybridClient(me.credentials)
49+
client := rest.APITokenClient(me.credentials)
5050
if err = client.Get(ctx, fmt.Sprintf("/api/v2/tags?entitySelector=%s&from=now-3y&to=now", url.QueryEscape(selector)), 200).Finish(v); err != nil {
5151
return err
5252
}
@@ -72,7 +72,7 @@ func (me *service) SchemaID() string {
7272
}
7373

7474
func (me *service) List(ctx context.Context) (api.Stubs, error) {
75-
return list.List(ctx, rest.HybridClient(me.credentials))
75+
return list.List(ctx, rest.APITokenClient(me.credentials))
7676
}
7777

7878
func (me *service) Validate(ctx context.Context, v *customtags.Settings) error {
@@ -90,7 +90,7 @@ func (me *service) Update(ctx context.Context, id string, v *customtags.Settings
9090
var err error
9191

9292
var settingsObj customtags.Settings
93-
client := rest.HybridClient(me.credentials)
93+
client := rest.APITokenClient(me.credentials)
9494
if err = client.Post(ctx, fmt.Sprintf("/api/v2/tags?entitySelector=%s&from=now-3y&to=now", url.QueryEscape(v.EntitySelector)), v, 200).Finish(&settingsObj); err != nil {
9595
return err
9696
}
@@ -108,7 +108,7 @@ func (me *service) Delete(ctx context.Context, id string) error {
108108
}
109109

110110
func (me *service) DeleteValue(ctx context.Context, v *customtags.Settings) error {
111-
client := rest.HybridClient(me.credentials)
111+
client := rest.APITokenClient(me.credentials)
112112
for _, tag := range v.Tags {
113113
if tag.Value == nil || len(*tag.Value) == 0 {
114114
if err := client.Delete(ctx, fmt.Sprintf("/api/v2/tags?key=%s&entitySelector=%s", url.QueryEscape(tag.Key), url.QueryEscape(v.EntitySelector)), 200).Finish(); err != nil {

dynatrace/api/v1/config/deployment/lambdaagent/service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const SchemaID = "v1:deployment:lambdaagent"
3030
const BasePath = "/api/v1/deployment/lambda/agent/latest"
3131

3232
func Service(credentials *rest.Credentials) settings.RService[*lambdaagent.Latest] {
33-
return &service{client: rest.HybridClient(credentials)}
33+
return &service{client: rest.APITokenClient(credentials)}
3434
}
3535

3636
type service struct {

dynatrace/api/v1/config/synthetic/monitors/browser/service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
const SchemaID = "v1:synthetic:monitors:browser"
3131

3232
func Service(credentials *rest.Credentials) settings.CRUDService[*browser.SyntheticMonitor] {
33-
return settings.NewHybridService(credentials, SchemaID, &settings.ServiceOptions[*browser.SyntheticMonitor]{
33+
return settings.NewAPITokenService(credentials, SchemaID, &settings.ServiceOptions[*browser.SyntheticMonitor]{
3434
Get: settings.Path("/api/v1/synthetic/monitors/%s"),
3535
List: settings.Path("/api/v1/synthetic/monitors?type=BROWSER"),
3636
CreateURL: func(v *browser.SyntheticMonitor) string { return "/api/v1/synthetic/monitors" },

dynatrace/api/v1/config/synthetic/monitors/http/script/service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const SchemaID = "v1:synthetic:monitors:http:script"
3333
const BasePath = "/api/v1/synthetic/monitors"
3434

3535
func Service(credentials *rest.Credentials) settings.CRUDService[*script.Settings] {
36-
return &service{scriptService: settings.NewHybridService(credentials, SchemaID, settings.DefaultServiceOptions[*script.Settings](http.BasePath)), httpService: http.Service(credentials)}
36+
return &service{scriptService: settings.NewAPITokenService(credentials, SchemaID, settings.DefaultServiceOptions[*script.Settings](http.BasePath)), httpService: http.Service(credentials)}
3737
}
3838

3939
type service struct {

dynatrace/api/v1/config/synthetic/monitors/http/service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const SchemaID = "v1:synthetic:monitors:http"
3333
const BasePath = "/api/v1/synthetic/monitors"
3434

3535
func Service(credentials *rest.Credentials) settings.CRUDService[*http.SyntheticMonitor] {
36-
return &service{service: settings.NewHybridService(credentials, SchemaID, &settings.ServiceOptions[*http.SyntheticMonitor]{
36+
return &service{service: settings.NewAPITokenService(credentials, SchemaID, &settings.ServiceOptions[*http.SyntheticMonitor]{
3737
Get: settings.Path("/api/v1/synthetic/monitors/%s"),
3838
List: settings.Path("/api/v1/synthetic/monitors?type=HTTP"),
3939
CreateURL: func(v *http.SyntheticMonitor) string { return "/api/v1/synthetic/monitors" },

dynatrace/api/v1/config/synthetic/nodes/service.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
const SchemaID = "v1:synthetic:nodes:all"
3232

3333
func Service(credentials *rest.Credentials) settings.RService[*nodes.Settings] {
34-
return &service{client: rest.HybridClient(credentials)}
34+
return &service{client: rest.APITokenClient(credentials)}
3535
}
3636

3737
type service struct {

dynatrace/api/v2/activegatetokens/service.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type service struct {
5050
func (me *service) Get(ctx context.Context, id string, v *activegatetokens.Settings) error {
5151
var err error
5252

53-
client := rest.HybridClient(me.credentials)
53+
client := rest.APITokenClient(me.credentials)
5454
req := client.Get(ctx, fmt.Sprintf("/api/v2/activeGateTokens/%s", url.PathEscape(id))).Expect(200)
5555
if err = req.Finish(v); err != nil {
5656
return err
@@ -80,7 +80,7 @@ func (me *service) Create(ctx context.Context, v *activegatetokens.Settings) (*a
8080
var err error
8181

8282
response := TokenCreateResponse{}
83-
client := rest.HybridClient(me.credentials)
83+
client := rest.APITokenClient(me.credentials)
8484
if err = client.Post(ctx, "/api/v2/activeGateTokens", v, 201).Finish(&response); err != nil {
8585
return nil, err
8686
}
@@ -101,7 +101,7 @@ func (me *service) Update(ctx context.Context, id string, v *activegatetokens.Se
101101
}
102102

103103
func (me *service) Delete(ctx context.Context, id string) error {
104-
return rest.HybridClient(me.credentials).Delete(ctx, fmt.Sprintf("/api/v2/activeGateTokens/%s", url.PathEscape(id)), 204).Finish()
104+
return rest.APITokenClient(me.credentials).Delete(ctx, fmt.Sprintf("/api/v2/activeGateTokens/%s", url.PathEscape(id)), 204).Finish()
105105
}
106106

107107
func (me *service) New() *activegatetokens.Settings {

dynatrace/api/v2/apitokens/service.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type service struct {
4141
func (me *service) Get(ctx context.Context, id string, v *apitokens.APIToken) error {
4242
var err error
4343

44-
client := rest.HybridClient(me.credentials)
44+
client := rest.APITokenClient(me.credentials)
4545
req := client.Get(ctx, fmt.Sprintf("/api/v2/apiTokens/%s", id)).Expect(200)
4646
if err = req.Finish(v); err != nil {
4747
return err
@@ -57,7 +57,7 @@ func (me *service) SchemaID() string {
5757
func (me *service) List(ctx context.Context) (api.Stubs, error) {
5858
var err error
5959

60-
client := rest.HybridClient(me.credentials)
60+
client := rest.APITokenClient(me.credentials)
6161
req := client.Get(ctx, "/api/v2/apiTokens?pageSize=10000&fields=%2Bscopes%2C%2BexpirationDate%2C%2BpersonalAccessToken&sort=-creationDate").Expect(200)
6262
var tokenlist apitokens.TokenList
6363
if err = req.Finish(&tokenlist); err != nil {
@@ -79,7 +79,7 @@ func (me *service) Create(ctx context.Context, v *apitokens.APIToken) (*api.Stub
7979
var err error
8080

8181
resultToken := apitokens.APIToken{}
82-
client := rest.HybridClient(me.credentials)
82+
client := rest.APITokenClient(me.credentials)
8383
if err = client.Post(ctx, "/api/v2/apiTokens", v, 201).Finish(&resultToken); err != nil {
8484
return nil, err
8585
}
@@ -98,11 +98,11 @@ func (me *service) Create(ctx context.Context, v *apitokens.APIToken) (*api.Stub
9898
}
9999

100100
func (me *service) Update(ctx context.Context, id string, v *apitokens.APIToken) error {
101-
return rest.HybridClient(me.credentials).Put(ctx, fmt.Sprintf("/api/v2/apiTokens/%s", id), v, 204).Finish()
101+
return rest.APITokenClient(me.credentials).Put(ctx, fmt.Sprintf("/api/v2/apiTokens/%s", id), v, 204).Finish()
102102
}
103103

104104
func (me *service) Delete(ctx context.Context, id string) error {
105-
return rest.HybridClient(me.credentials).Delete(ctx, fmt.Sprintf("/api/v2/apiTokens/%s", id), 204).Finish()
105+
return rest.APITokenClient(me.credentials).Delete(ctx, fmt.Sprintf("/api/v2/apiTokens/%s", id), 204).Finish()
106106
}
107107

108108
func (me *service) New() *apitokens.APIToken {

0 commit comments

Comments
 (0)