Skip to content

Commit fd3baa2

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
api-clients-generation-pipeline[bot]
and
ci.datadog-api-spec
authored
Fix merge queue failure. (DataDog#3988)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent 070859e commit fd3baa2

38 files changed

Lines changed: 261 additions & 1024 deletions

File tree

‎.generator/schemas/v2/openapi.yaml‎

Lines changed: 54 additions & 210 deletions
Large diffs are not rendered by default.

‎api/datadog/configuration.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -875,8 +875,6 @@ func NewConfiguration() *Configuration {
875875
"v2.DeleteOrgGroupPolicyOverride": false,
876876
"v2.GetOrgGroup": false,
877877
"v2.GetOrgGroupMembership": false,
878-
"v2.GetOrgGroupPolicy": false,
879-
"v2.GetOrgGroupPolicyOverride": false,
880878
"v2.ListOrgGroupMemberships": false,
881879
"v2.ListOrgGroupPolicies": false,
882880
"v2.ListOrgGroupPolicyConfigs": false,

‎api/datadogV2/api_key_management.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ func (a *KeyManagementApi) GetCurrentUserApplicationKey(ctx _context.Context, ap
753753

754754
// GetPersonalAccessToken Get a personal access token.
755755
// Get a specific personal access token by its UUID.
756-
func (a *KeyManagementApi) GetPersonalAccessToken(ctx _context.Context, patId string) (PersonalAccessTokenResponse, *_nethttp.Response, error) {
756+
func (a *KeyManagementApi) GetPersonalAccessToken(ctx _context.Context, patUuid string) (PersonalAccessTokenResponse, *_nethttp.Response, error) {
757757
var (
758758
localVarHTTPMethod = _nethttp.MethodGet
759759
localVarPostBody interface{}
@@ -765,8 +765,8 @@ func (a *KeyManagementApi) GetPersonalAccessToken(ctx _context.Context, patId st
765765
return localVarReturnValue, nil, datadog.GenericOpenAPIError{ErrorMessage: err.Error()}
766766
}
767767

768-
localVarPath := localBasePath + "/api/v2/personal_access_tokens/{pat_id}"
769-
localVarPath = datadog.ReplacePathParameter(localVarPath, "{pat_id}", _neturl.PathEscape(datadog.ParameterToString(patId, "")))
768+
localVarPath := localBasePath + "/api/v2/personal_access_tokens/{pat_uuid}"
769+
localVarPath = datadog.ReplacePathParameter(localVarPath, "{pat_uuid}", _neturl.PathEscape(datadog.ParameterToString(patUuid, "")))
770770

771771
localVarHeaderParams := make(map[string]string)
772772
localVarQueryParams := _neturl.Values{}
@@ -1519,7 +1519,7 @@ func (a *KeyManagementApi) ListPersonalAccessTokens(ctx _context.Context, o ...L
15191519

15201520
// RevokePersonalAccessToken Revoke a personal access token.
15211521
// Revoke a specific personal access token.
1522-
func (a *KeyManagementApi) RevokePersonalAccessToken(ctx _context.Context, patId string) (*_nethttp.Response, error) {
1522+
func (a *KeyManagementApi) RevokePersonalAccessToken(ctx _context.Context, patUuid string) (*_nethttp.Response, error) {
15231523
var (
15241524
localVarHTTPMethod = _nethttp.MethodDelete
15251525
localVarPostBody interface{}
@@ -1530,8 +1530,8 @@ func (a *KeyManagementApi) RevokePersonalAccessToken(ctx _context.Context, patId
15301530
return nil, datadog.GenericOpenAPIError{ErrorMessage: err.Error()}
15311531
}
15321532

1533-
localVarPath := localBasePath + "/api/v2/personal_access_tokens/{pat_id}"
1534-
localVarPath = datadog.ReplacePathParameter(localVarPath, "{pat_id}", _neturl.PathEscape(datadog.ParameterToString(patId, "")))
1533+
localVarPath := localBasePath + "/api/v2/personal_access_tokens/{pat_uuid}"
1534+
localVarPath = datadog.ReplacePathParameter(localVarPath, "{pat_uuid}", _neturl.PathEscape(datadog.ParameterToString(patUuid, "")))
15351535

15361536
localVarHeaderParams := make(map[string]string)
15371537
localVarQueryParams := _neturl.Values{}
@@ -1831,7 +1831,7 @@ func (a *KeyManagementApi) UpdateCurrentUserApplicationKey(ctx _context.Context,
18311831

18321832
// UpdatePersonalAccessToken Update a personal access token.
18331833
// Update a specific personal access token.
1834-
func (a *KeyManagementApi) UpdatePersonalAccessToken(ctx _context.Context, patId string, body PersonalAccessTokenUpdateRequest) (PersonalAccessTokenResponse, *_nethttp.Response, error) {
1834+
func (a *KeyManagementApi) UpdatePersonalAccessToken(ctx _context.Context, patUuid string, body PersonalAccessTokenUpdateRequest) (PersonalAccessTokenResponse, *_nethttp.Response, error) {
18351835
var (
18361836
localVarHTTPMethod = _nethttp.MethodPatch
18371837
localVarPostBody interface{}
@@ -1843,8 +1843,8 @@ func (a *KeyManagementApi) UpdatePersonalAccessToken(ctx _context.Context, patId
18431843
return localVarReturnValue, nil, datadog.GenericOpenAPIError{ErrorMessage: err.Error()}
18441844
}
18451845

1846-
localVarPath := localBasePath + "/api/v2/personal_access_tokens/{pat_id}"
1847-
localVarPath = datadog.ReplacePathParameter(localVarPath, "{pat_id}", _neturl.PathEscape(datadog.ParameterToString(patId, "")))
1846+
localVarPath := localBasePath + "/api/v2/personal_access_tokens/{pat_uuid}"
1847+
localVarPath = datadog.ReplacePathParameter(localVarPath, "{pat_uuid}", _neturl.PathEscape(datadog.ParameterToString(patUuid, "")))
18481848

18491849
localVarHeaderParams := make(map[string]string)
18501850
localVarQueryParams := _neturl.Values{}

‎api/datadogV2/api_org_groups.go‎

Lines changed: 1 addition & 193 deletions
Original file line numberDiff line numberDiff line change
@@ -860,198 +860,6 @@ func (a *OrgGroupsApi) GetOrgGroupMembership(ctx _context.Context, orgGroupMembe
860860
return localVarReturnValue, localVarHTTPResponse, nil
861861
}
862862

863-
// GetOrgGroupPolicy Get an org group policy.
864-
// Get a specific organization group policy by its ID.
865-
func (a *OrgGroupsApi) GetOrgGroupPolicy(ctx _context.Context, orgGroupPolicyId uuid.UUID) (OrgGroupPolicyResponse, *_nethttp.Response, error) {
866-
var (
867-
localVarHTTPMethod = _nethttp.MethodGet
868-
localVarPostBody interface{}
869-
localVarReturnValue OrgGroupPolicyResponse
870-
)
871-
872-
operationId := "v2.GetOrgGroupPolicy"
873-
isOperationEnabled := a.Client.Cfg.IsUnstableOperationEnabled(operationId)
874-
if !isOperationEnabled {
875-
return localVarReturnValue, nil, datadog.GenericOpenAPIError{ErrorMessage: _fmt.Sprintf("Unstable operation '%s' is disabled", operationId)}
876-
}
877-
if isOperationEnabled && a.Client.Cfg.Debug {
878-
_log.Printf("WARNING: Using unstable operation '%s'", operationId)
879-
}
880-
881-
localBasePath, err := a.Client.Cfg.ServerURLWithContext(ctx, "v2.OrgGroupsApi.GetOrgGroupPolicy")
882-
if err != nil {
883-
return localVarReturnValue, nil, datadog.GenericOpenAPIError{ErrorMessage: err.Error()}
884-
}
885-
886-
localVarPath := localBasePath + "/api/v2/org_group_policies/{org_group_policy_id}"
887-
localVarPath = datadog.ReplacePathParameter(localVarPath, "{org_group_policy_id}", _neturl.PathEscape(datadog.ParameterToString(orgGroupPolicyId, "")))
888-
889-
localVarHeaderParams := make(map[string]string)
890-
localVarQueryParams := _neturl.Values{}
891-
localVarFormParams := _neturl.Values{}
892-
localVarHeaderParams["Accept"] = "application/json"
893-
894-
if a.Client.Cfg.DelegatedTokenConfig != nil {
895-
err = datadog.UseDelegatedTokenAuth(ctx, &localVarHeaderParams, a.Client.Cfg.DelegatedTokenConfig)
896-
if err != nil {
897-
return localVarReturnValue, nil, err
898-
}
899-
} else {
900-
datadog.SetAuthKeys(
901-
ctx,
902-
&localVarHeaderParams,
903-
[2]string{"apiKeyAuth", "DD-API-KEY"},
904-
[2]string{"appKeyAuth", "DD-APPLICATION-KEY"},
905-
)
906-
}
907-
req, err := a.Client.PrepareRequest(ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, nil)
908-
if err != nil {
909-
return localVarReturnValue, nil, err
910-
}
911-
912-
localVarHTTPResponse, err := a.Client.CallAPI(req)
913-
if err != nil || localVarHTTPResponse == nil {
914-
return localVarReturnValue, localVarHTTPResponse, err
915-
}
916-
917-
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
918-
if err != nil {
919-
return localVarReturnValue, localVarHTTPResponse, err
920-
}
921-
922-
if localVarHTTPResponse.StatusCode >= 300 {
923-
newErr := datadog.GenericOpenAPIError{
924-
ErrorBody: localVarBody,
925-
ErrorMessage: localVarHTTPResponse.Status,
926-
}
927-
if localVarHTTPResponse.StatusCode == 400 || localVarHTTPResponse.StatusCode == 401 || localVarHTTPResponse.StatusCode == 403 || localVarHTTPResponse.StatusCode == 404 {
928-
var v JSONAPIErrorResponse
929-
err = a.Client.Decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
930-
if err != nil {
931-
return localVarReturnValue, localVarHTTPResponse, newErr
932-
}
933-
newErr.ErrorModel = v
934-
return localVarReturnValue, localVarHTTPResponse, newErr
935-
}
936-
if localVarHTTPResponse.StatusCode == 429 {
937-
var v APIErrorResponse
938-
err = a.Client.Decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
939-
if err != nil {
940-
return localVarReturnValue, localVarHTTPResponse, newErr
941-
}
942-
newErr.ErrorModel = v
943-
}
944-
return localVarReturnValue, localVarHTTPResponse, newErr
945-
}
946-
947-
err = a.Client.Decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
948-
if err != nil {
949-
newErr := datadog.GenericOpenAPIError{
950-
ErrorBody: localVarBody,
951-
ErrorMessage: err.Error(),
952-
}
953-
return localVarReturnValue, localVarHTTPResponse, newErr
954-
}
955-
956-
return localVarReturnValue, localVarHTTPResponse, nil
957-
}
958-
959-
// GetOrgGroupPolicyOverride Get an org group policy override.
960-
// Get a specific organization group policy override by its ID.
961-
func (a *OrgGroupsApi) GetOrgGroupPolicyOverride(ctx _context.Context, orgGroupPolicyOverrideId uuid.UUID) (OrgGroupPolicyOverrideResponse, *_nethttp.Response, error) {
962-
var (
963-
localVarHTTPMethod = _nethttp.MethodGet
964-
localVarPostBody interface{}
965-
localVarReturnValue OrgGroupPolicyOverrideResponse
966-
)
967-
968-
operationId := "v2.GetOrgGroupPolicyOverride"
969-
isOperationEnabled := a.Client.Cfg.IsUnstableOperationEnabled(operationId)
970-
if !isOperationEnabled {
971-
return localVarReturnValue, nil, datadog.GenericOpenAPIError{ErrorMessage: _fmt.Sprintf("Unstable operation '%s' is disabled", operationId)}
972-
}
973-
if isOperationEnabled && a.Client.Cfg.Debug {
974-
_log.Printf("WARNING: Using unstable operation '%s'", operationId)
975-
}
976-
977-
localBasePath, err := a.Client.Cfg.ServerURLWithContext(ctx, "v2.OrgGroupsApi.GetOrgGroupPolicyOverride")
978-
if err != nil {
979-
return localVarReturnValue, nil, datadog.GenericOpenAPIError{ErrorMessage: err.Error()}
980-
}
981-
982-
localVarPath := localBasePath + "/api/v2/org_group_policy_overrides/{org_group_policy_override_id}"
983-
localVarPath = datadog.ReplacePathParameter(localVarPath, "{org_group_policy_override_id}", _neturl.PathEscape(datadog.ParameterToString(orgGroupPolicyOverrideId, "")))
984-
985-
localVarHeaderParams := make(map[string]string)
986-
localVarQueryParams := _neturl.Values{}
987-
localVarFormParams := _neturl.Values{}
988-
localVarHeaderParams["Accept"] = "application/json"
989-
990-
if a.Client.Cfg.DelegatedTokenConfig != nil {
991-
err = datadog.UseDelegatedTokenAuth(ctx, &localVarHeaderParams, a.Client.Cfg.DelegatedTokenConfig)
992-
if err != nil {
993-
return localVarReturnValue, nil, err
994-
}
995-
} else {
996-
datadog.SetAuthKeys(
997-
ctx,
998-
&localVarHeaderParams,
999-
[2]string{"apiKeyAuth", "DD-API-KEY"},
1000-
[2]string{"appKeyAuth", "DD-APPLICATION-KEY"},
1001-
)
1002-
}
1003-
req, err := a.Client.PrepareRequest(ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, nil)
1004-
if err != nil {
1005-
return localVarReturnValue, nil, err
1006-
}
1007-
1008-
localVarHTTPResponse, err := a.Client.CallAPI(req)
1009-
if err != nil || localVarHTTPResponse == nil {
1010-
return localVarReturnValue, localVarHTTPResponse, err
1011-
}
1012-
1013-
localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
1014-
if err != nil {
1015-
return localVarReturnValue, localVarHTTPResponse, err
1016-
}
1017-
1018-
if localVarHTTPResponse.StatusCode >= 300 {
1019-
newErr := datadog.GenericOpenAPIError{
1020-
ErrorBody: localVarBody,
1021-
ErrorMessage: localVarHTTPResponse.Status,
1022-
}
1023-
if localVarHTTPResponse.StatusCode == 400 || localVarHTTPResponse.StatusCode == 401 || localVarHTTPResponse.StatusCode == 403 || localVarHTTPResponse.StatusCode == 404 {
1024-
var v JSONAPIErrorResponse
1025-
err = a.Client.Decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
1026-
if err != nil {
1027-
return localVarReturnValue, localVarHTTPResponse, newErr
1028-
}
1029-
newErr.ErrorModel = v
1030-
return localVarReturnValue, localVarHTTPResponse, newErr
1031-
}
1032-
if localVarHTTPResponse.StatusCode == 429 {
1033-
var v APIErrorResponse
1034-
err = a.Client.Decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
1035-
if err != nil {
1036-
return localVarReturnValue, localVarHTTPResponse, newErr
1037-
}
1038-
newErr.ErrorModel = v
1039-
}
1040-
return localVarReturnValue, localVarHTTPResponse, newErr
1041-
}
1042-
1043-
err = a.Client.Decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
1044-
if err != nil {
1045-
newErr := datadog.GenericOpenAPIError{
1046-
ErrorBody: localVarBody,
1047-
ErrorMessage: err.Error(),
1048-
}
1049-
return localVarReturnValue, localVarHTTPResponse, newErr
1050-
}
1051-
1052-
return localVarReturnValue, localVarHTTPResponse, nil
1053-
}
1054-
1055863
// ListOrgGroupMembershipsOptionalParameters holds optional parameters for ListOrgGroupMemberships.
1056864
type ListOrgGroupMembershipsOptionalParameters struct {
1057865
FilterOrgGroupId *uuid.UUID
@@ -1970,7 +1778,7 @@ func (a *OrgGroupsApi) UpdateOrgGroupMembership(ctx _context.Context, orgGroupMe
19701778
}
19711779

19721780
// UpdateOrgGroupPolicy Update an org group policy.
1973-
// Update an existing organization group policy.
1781+
// Update the content of an existing organization group policy.
19741782
func (a *OrgGroupsApi) UpdateOrgGroupPolicy(ctx _context.Context, orgGroupPolicyId uuid.UUID, body OrgGroupPolicyUpdateRequest) (OrgGroupPolicyResponse, *_nethttp.Response, error) {
19751783
var (
19761784
localVarHTTPMethod = _nethttp.MethodPatch

‎api/datadogV2/api_service_accounts.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ func (a *ServiceAccountsApi) DeleteServiceAccountApplicationKey(ctx _context.Con
328328

329329
// GetServiceAccountAccessToken Get an access token for a service account.
330330
// Get a specific access token for a service account by its UUID.
331-
func (a *ServiceAccountsApi) GetServiceAccountAccessToken(ctx _context.Context, serviceAccountId string, patId string) (PersonalAccessTokenResponse, *_nethttp.Response, error) {
331+
func (a *ServiceAccountsApi) GetServiceAccountAccessToken(ctx _context.Context, serviceAccountId string, patUuid string) (PersonalAccessTokenResponse, *_nethttp.Response, error) {
332332
var (
333333
localVarHTTPMethod = _nethttp.MethodGet
334334
localVarPostBody interface{}
@@ -340,9 +340,9 @@ func (a *ServiceAccountsApi) GetServiceAccountAccessToken(ctx _context.Context,
340340
return localVarReturnValue, nil, datadog.GenericOpenAPIError{ErrorMessage: err.Error()}
341341
}
342342

343-
localVarPath := localBasePath + "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_id}"
343+
localVarPath := localBasePath + "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_uuid}"
344344
localVarPath = datadog.ReplacePathParameter(localVarPath, "{service_account_id}", _neturl.PathEscape(datadog.ParameterToString(serviceAccountId, "")))
345-
localVarPath = datadog.ReplacePathParameter(localVarPath, "{pat_id}", _neturl.PathEscape(datadog.ParameterToString(patId, "")))
345+
localVarPath = datadog.ReplacePathParameter(localVarPath, "{pat_uuid}", _neturl.PathEscape(datadog.ParameterToString(patUuid, "")))
346346

347347
localVarHeaderParams := make(map[string]string)
348348
localVarQueryParams := _neturl.Values{}
@@ -778,7 +778,7 @@ func (a *ServiceAccountsApi) ListServiceAccountApplicationKeys(ctx _context.Cont
778778

779779
// RevokeServiceAccountAccessToken Revoke an access token for a service account.
780780
// Revoke a specific access token for a service account.
781-
func (a *ServiceAccountsApi) RevokeServiceAccountAccessToken(ctx _context.Context, serviceAccountId string, patId string) (*_nethttp.Response, error) {
781+
func (a *ServiceAccountsApi) RevokeServiceAccountAccessToken(ctx _context.Context, serviceAccountId string, patUuid string) (*_nethttp.Response, error) {
782782
var (
783783
localVarHTTPMethod = _nethttp.MethodDelete
784784
localVarPostBody interface{}
@@ -789,9 +789,9 @@ func (a *ServiceAccountsApi) RevokeServiceAccountAccessToken(ctx _context.Contex
789789
return nil, datadog.GenericOpenAPIError{ErrorMessage: err.Error()}
790790
}
791791

792-
localVarPath := localBasePath + "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_id}"
792+
localVarPath := localBasePath + "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_uuid}"
793793
localVarPath = datadog.ReplacePathParameter(localVarPath, "{service_account_id}", _neturl.PathEscape(datadog.ParameterToString(serviceAccountId, "")))
794-
localVarPath = datadog.ReplacePathParameter(localVarPath, "{pat_id}", _neturl.PathEscape(datadog.ParameterToString(patId, "")))
794+
localVarPath = datadog.ReplacePathParameter(localVarPath, "{pat_uuid}", _neturl.PathEscape(datadog.ParameterToString(patUuid, "")))
795795

796796
localVarHeaderParams := make(map[string]string)
797797
localVarQueryParams := _neturl.Values{}
@@ -847,7 +847,7 @@ func (a *ServiceAccountsApi) RevokeServiceAccountAccessToken(ctx _context.Contex
847847

848848
// UpdateServiceAccountAccessToken Update an access token for a service account.
849849
// Update a specific access token for a service account.
850-
func (a *ServiceAccountsApi) UpdateServiceAccountAccessToken(ctx _context.Context, serviceAccountId string, patId string, body PersonalAccessTokenUpdateRequest) (PersonalAccessTokenResponse, *_nethttp.Response, error) {
850+
func (a *ServiceAccountsApi) UpdateServiceAccountAccessToken(ctx _context.Context, serviceAccountId string, patUuid string, body PersonalAccessTokenUpdateRequest) (PersonalAccessTokenResponse, *_nethttp.Response, error) {
851851
var (
852852
localVarHTTPMethod = _nethttp.MethodPatch
853853
localVarPostBody interface{}
@@ -859,9 +859,9 @@ func (a *ServiceAccountsApi) UpdateServiceAccountAccessToken(ctx _context.Contex
859859
return localVarReturnValue, nil, datadog.GenericOpenAPIError{ErrorMessage: err.Error()}
860860
}
861861

862-
localVarPath := localBasePath + "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_id}"
862+
localVarPath := localBasePath + "/api/v2/service_accounts/{service_account_id}/access_tokens/{pat_uuid}"
863863
localVarPath = datadog.ReplacePathParameter(localVarPath, "{service_account_id}", _neturl.PathEscape(datadog.ParameterToString(serviceAccountId, "")))
864-
localVarPath = datadog.ReplacePathParameter(localVarPath, "{pat_id}", _neturl.PathEscape(datadog.ParameterToString(patId, "")))
864+
localVarPath = datadog.ReplacePathParameter(localVarPath, "{pat_uuid}", _neturl.PathEscape(datadog.ParameterToString(patUuid, "")))
865865

866866
localVarHeaderParams := make(map[string]string)
867867
localVarQueryParams := _neturl.Values{}

‎api/datadogV2/doc.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,8 +619,6 @@
619619
// - [OrgGroupsApi.DeleteOrgGroupPolicyOverride]
620620
// - [OrgGroupsApi.GetOrgGroup]
621621
// - [OrgGroupsApi.GetOrgGroupMembership]
622-
// - [OrgGroupsApi.GetOrgGroupPolicy]
623-
// - [OrgGroupsApi.GetOrgGroupPolicyOverride]
624622
// - [OrgGroupsApi.ListOrgGroupMemberships]
625623
// - [OrgGroupsApi.ListOrgGroupPolicies]
626624
// - [OrgGroupsApi.ListOrgGroupPolicyConfigs]

0 commit comments

Comments
 (0)