[pull] master from DataDog:master

api/datadog/configuration.go

@@ -702,6 +702,8 @@ func NewConfiguration() *Configuration {
 			"v2.GetSLOReport":                            false,
 			"v2.GetSLOReportJobStatus":                   false,
 			"v2.GetSPARecommendations":                   false,
+			"v2.CreateSCAResolveVulnerableSymbols":       false,
+			"v2.CreateSCAResult":                         false,
 			"v2.AddMemberTeam":                           false,
 			"v2.ListMemberTeams":                         false,
 			"v2.RemoveMemberTeam":                        false,

api/datadogV2/api_agentless_scanning.go

@@ -15,7 +15,7 @@ import (
 // AgentlessScanningApi service type
 type AgentlessScanningApi datadog.Service
 
-// CreateAwsOnDemandTask Post an AWS on demand task.
+// CreateAwsOnDemandTask Create AWS on demand task.
 // Trigger the scan of an AWS resource with a high priority. Agentless scanning must be activated for the AWS account containing the resource to scan.
 func (a *AgentlessScanningApi) CreateAwsOnDemandTask(ctx _context.Context, body AwsOnDemandCreateRequest) (AwsOnDemandResponse, *_nethttp.Response, error) {
 	var (
@@ -95,7 +95,7 @@ func (a *AgentlessScanningApi) CreateAwsOnDemandTask(ctx _context.Context, body
 	return localVarReturnValue, localVarHTTPResponse, nil
 }
 
-// CreateAwsScanOptions Post AWS Scan Options.
+// CreateAwsScanOptions Create AWS scan options.
 // Activate Agentless scan options for an AWS account.
 func (a *AgentlessScanningApi) CreateAwsScanOptions(ctx _context.Context, body AwsScanOptionsCreateRequest) (AwsScanOptionsResponse, *_nethttp.Response, error) {
 	var (
@@ -175,7 +175,7 @@ func (a *AgentlessScanningApi) CreateAwsScanOptions(ctx _context.Context, body A
 	return localVarReturnValue, localVarHTTPResponse, nil
 }
 
-// CreateAzureScanOptions Create azure scan options.
+// CreateAzureScanOptions Create Azure scan options.
 // Activate Agentless scan options for an Azure subscription.
 func (a *AgentlessScanningApi) CreateAzureScanOptions(ctx _context.Context, body AzureScanOptions) (AzureScanOptions, *_nethttp.Response, error) {
 	var (
@@ -255,7 +255,7 @@ func (a *AgentlessScanningApi) CreateAzureScanOptions(ctx _context.Context, body
 	return localVarReturnValue, localVarHTTPResponse, nil
 }
 
-// CreateGcpScanOptions Post GCP Scan Options.
+// CreateGcpScanOptions Create GCP scan options.
 // Activate Agentless scan options for a GCP project.
 func (a *AgentlessScanningApi) CreateGcpScanOptions(ctx _context.Context, body GcpScanOptions) (GcpScanOptions, *_nethttp.Response, error) {
 	var (
@@ -335,7 +335,7 @@ func (a *AgentlessScanningApi) CreateGcpScanOptions(ctx _context.Context, body G
 	return localVarReturnValue, localVarHTTPResponse, nil
 }
 
-// DeleteAwsScanOptions Delete AWS Scan Options.
+// DeleteAwsScanOptions Delete AWS scan options.
 // Delete Agentless scan options for an AWS account.
 func (a *AgentlessScanningApi) DeleteAwsScanOptions(ctx _context.Context, accountId string) (*_nethttp.Response, error) {
 	var (
@@ -403,7 +403,7 @@ func (a *AgentlessScanningApi) DeleteAwsScanOptions(ctx _context.Context, accoun
 	return localVarHTTPResponse, nil
 }
 
-// DeleteAzureScanOptions Delete azure scan options.
+// DeleteAzureScanOptions Delete Azure scan options.
 // Delete Agentless scan options for an Azure subscription.
 func (a *AgentlessScanningApi) DeleteAzureScanOptions(ctx _context.Context, subscriptionId string) (*_nethttp.Response, error) {
 	var (
@@ -471,7 +471,7 @@ func (a *AgentlessScanningApi) DeleteAzureScanOptions(ctx _context.Context, subs
 	return localVarHTTPResponse, nil
 }
 
-// DeleteGcpScanOptions Delete GCP Scan Options.
+// DeleteGcpScanOptions Delete GCP scan options.
 // Delete Agentless scan options for a GCP project.
 func (a *AgentlessScanningApi) DeleteGcpScanOptions(ctx _context.Context, projectId string) (*_nethttp.Response, error) {
 	var (
@@ -539,7 +539,7 @@ func (a *AgentlessScanningApi) DeleteGcpScanOptions(ctx _context.Context, projec
 	return localVarHTTPResponse, nil
 }
 
-// GetAwsOnDemandTask Get AWS On Demand task by id.
+// GetAwsOnDemandTask Get AWS on demand task.
 // Fetch the data of a specific on demand task.
 func (a *AgentlessScanningApi) GetAwsOnDemandTask(ctx _context.Context, taskId string) (AwsOnDemandResponse, *_nethttp.Response, error) {
 	var (
@@ -851,7 +851,7 @@ func (a *AgentlessScanningApi) GetGcpScanOptions(ctx _context.Context, projectId
 	return localVarReturnValue, localVarHTTPResponse, nil
 }
 
-// ListAwsOnDemandTasks Get AWS On Demand tasks.
+// ListAwsOnDemandTasks List AWS on demand tasks.
 // Fetches the most recent 1000 AWS on demand tasks.
 func (a *AgentlessScanningApi) ListAwsOnDemandTasks(ctx _context.Context) (AwsOnDemandListResponse, *_nethttp.Response, error) {
 	var (
@@ -928,7 +928,7 @@ func (a *AgentlessScanningApi) ListAwsOnDemandTasks(ctx _context.Context) (AwsOn
 	return localVarReturnValue, localVarHTTPResponse, nil
 }
 
-// ListAwsScanOptions List AWS Scan Options.
+// ListAwsScanOptions List AWS scan options.
 // Fetches the scan options configured for AWS accounts.
 func (a *AgentlessScanningApi) ListAwsScanOptions(ctx _context.Context) (AwsScanOptionsListResponse, *_nethttp.Response, error) {
 	var (
@@ -1005,7 +1005,7 @@ func (a *AgentlessScanningApi) ListAwsScanOptions(ctx _context.Context) (AwsScan
 	return localVarReturnValue, localVarHTTPResponse, nil
 }
 
-// ListAzureScanOptions List azure scan options.
+// ListAzureScanOptions List Azure scan options.
 // Fetches the scan options configured for Azure accounts.
 func (a *AgentlessScanningApi) ListAzureScanOptions(ctx _context.Context) (AzureScanOptionsArray, *_nethttp.Response, error) {
 	var (
@@ -1082,7 +1082,7 @@ func (a *AgentlessScanningApi) ListAzureScanOptions(ctx _context.Context) (Azure
 	return localVarReturnValue, localVarHTTPResponse, nil
 }
 
-// ListGcpScanOptions List GCP Scan Options.
+// ListGcpScanOptions List GCP scan options.
 // Fetches the scan options configured for all GCP projects.
 func (a *AgentlessScanningApi) ListGcpScanOptions(ctx _context.Context) (GcpScanOptionsArray, *_nethttp.Response, error) {
 	var (
@@ -1159,7 +1159,7 @@ func (a *AgentlessScanningApi) ListGcpScanOptions(ctx _context.Context) (GcpScan
 	return localVarReturnValue, localVarHTTPResponse, nil
 }
 
-// UpdateAwsScanOptions Patch AWS Scan Options.
+// UpdateAwsScanOptions Update AWS scan options.
 // Update the Agentless scan options for an activated account.
 func (a *AgentlessScanningApi) UpdateAwsScanOptions(ctx _context.Context, accountId string, body AwsScanOptionsUpdateRequest) (*_nethttp.Response, error) {
 	var (
@@ -1230,7 +1230,7 @@ func (a *AgentlessScanningApi) UpdateAwsScanOptions(ctx _context.Context, accoun
 	return localVarHTTPResponse, nil
 }
 
-// UpdateAzureScanOptions Update azure scan options.
+// UpdateAzureScanOptions Update Azure scan options.
 // Update the Agentless scan options for an activated subscription.
 func (a *AgentlessScanningApi) UpdateAzureScanOptions(ctx _context.Context, subscriptionId string, body AzureScanOptionsInputUpdate) (AzureScanOptions, *_nethttp.Response, error) {
 	var (
@@ -1311,7 +1311,7 @@ func (a *AgentlessScanningApi) UpdateAzureScanOptions(ctx _context.Context, subs
 	return localVarReturnValue, localVarHTTPResponse, nil
 }
 
-// UpdateGcpScanOptions Patch GCP Scan Options.
+// UpdateGcpScanOptions Update GCP scan options.
 // Update the Agentless scan options for an activated GCP project.
 func (a *AgentlessScanningApi) UpdateGcpScanOptions(ctx _context.Context, projectId string, body GcpScanOptionsInputUpdate) (GcpScanOptions, *_nethttp.Response, error) {
 	var (

api/datadogV2/api_static_analysis.go

@@ -0,0 +1,193 @@
+// Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2019-Present Datadog, Inc.
+
+package datadogV2
+
+import (
+	_context "context"
+	_fmt "fmt"
+	_log "log"
+	_nethttp "net/http"
+	_neturl "net/url"
+
+	"github.com/DataDog/datadog-api-client-go/v2/api/datadog"
+)
+
+// StaticAnalysisApi service type
+type StaticAnalysisApi datadog.Service
+
+// CreateSCAResolveVulnerableSymbols POST request to resolve vulnerable symbols.
+
+func (a *StaticAnalysisApi) CreateSCAResolveVulnerableSymbols(ctx _context.Context, body ResolveVulnerableSymbolsRequest) (ResolveVulnerableSymbolsResponse, *_nethttp.Response, error) {
+	var (
+		localVarHTTPMethod  = _nethttp.MethodPost
+		localVarPostBody    interface{}
+		localVarReturnValue ResolveVulnerableSymbolsResponse
+	)
+
+	operationId := "v2.CreateSCAResolveVulnerableSymbols"
+	isOperationEnabled := a.Client.Cfg.IsUnstableOperationEnabled(operationId)
+	if !isOperationEnabled {
+		return localVarReturnValue, nil, datadog.GenericOpenAPIError{ErrorMessage: _fmt.Sprintf("Unstable operation '%s' is disabled", operationId)}
+	}
+	if isOperationEnabled && a.Client.Cfg.Debug {
+		_log.Printf("WARNING: Using unstable operation '%s'", operationId)
+	}
+
+	localBasePath, err := a.Client.Cfg.ServerURLWithContext(ctx, "v2.StaticAnalysisApi.CreateSCAResolveVulnerableSymbols")
+	if err != nil {
+		return localVarReturnValue, nil, datadog.GenericOpenAPIError{ErrorMessage: err.Error()}
+	}
+
+	localVarPath := localBasePath + "/api/v2/static-analysis-sca/vulnerabilities/resolve-vulnerable-symbols"
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
+	localVarHeaderParams["Content-Type"] = "application/json"
+	localVarHeaderParams["Accept"] = "application/json"
+
+	// body params
+	localVarPostBody = &body
+	if a.Client.Cfg.DelegatedTokenConfig != nil {
+		err = datadog.UseDelegatedTokenAuth(ctx, &localVarHeaderParams, a.Client.Cfg.DelegatedTokenConfig)
+		if err != nil {
+			return localVarReturnValue, nil, err
+		}
+	} else {
+		datadog.SetAuthKeys(
+			ctx,
+			&localVarHeaderParams,
+			[2]string{"apiKeyAuth", "DD-API-KEY"},
+			[2]string{"appKeyAuth", "DD-APPLICATION-KEY"},
+		)
+	}
+	req, err := a.Client.PrepareRequest(ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, nil)
+	if err != nil {
+		return localVarReturnValue, nil, err
+	}
+
+	localVarHTTPResponse, err := a.Client.CallAPI(req)
+	if err != nil || localVarHTTPResponse == nil {
+		return localVarReturnValue, localVarHTTPResponse, err
+	}
+
+	localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
+	if err != nil {
+		return localVarReturnValue, localVarHTTPResponse, err
+	}
+
+	if localVarHTTPResponse.StatusCode >= 300 {
+		newErr := datadog.GenericOpenAPIError{
+			ErrorBody:    localVarBody,
+			ErrorMessage: localVarHTTPResponse.Status,
+		}
+		if localVarHTTPResponse.StatusCode == 429 {
+			var v APIErrorResponse
+			err = a.Client.Decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+			if err != nil {
+				return localVarReturnValue, localVarHTTPResponse, newErr
+			}
+			newErr.ErrorModel = v
+		}
+		return localVarReturnValue, localVarHTTPResponse, newErr
+	}
+
+	err = a.Client.Decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+	if err != nil {
+		newErr := datadog.GenericOpenAPIError{
+			ErrorBody:    localVarBody,
+			ErrorMessage: err.Error(),
+		}
+		return localVarReturnValue, localVarHTTPResponse, newErr
+	}
+
+	return localVarReturnValue, localVarHTTPResponse, nil
+}
+
+// CreateSCAResult Post dependencies for analysis.
+
+func (a *StaticAnalysisApi) CreateSCAResult(ctx _context.Context, body ScaRequest) (*_nethttp.Response, error) {
+	var (
+		localVarHTTPMethod = _nethttp.MethodPost
+		localVarPostBody   interface{}
+	)
+
+	operationId := "v2.CreateSCAResult"
+	isOperationEnabled := a.Client.Cfg.IsUnstableOperationEnabled(operationId)
+	if !isOperationEnabled {
+		return nil, datadog.GenericOpenAPIError{ErrorMessage: _fmt.Sprintf("Unstable operation '%s' is disabled", operationId)}
+	}
+	if isOperationEnabled && a.Client.Cfg.Debug {
+		_log.Printf("WARNING: Using unstable operation '%s'", operationId)
+	}
+
+	localBasePath, err := a.Client.Cfg.ServerURLWithContext(ctx, "v2.StaticAnalysisApi.CreateSCAResult")
+	if err != nil {
+		return nil, datadog.GenericOpenAPIError{ErrorMessage: err.Error()}
+	}
+
+	localVarPath := localBasePath + "/api/v2/static-analysis-sca/dependencies"
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := _neturl.Values{}
+	localVarFormParams := _neturl.Values{}
+	localVarHeaderParams["Content-Type"] = "application/json"
+	localVarHeaderParams["Accept"] = "*/*"
+
+	// body params
+	localVarPostBody = &body
+	if a.Client.Cfg.DelegatedTokenConfig != nil {
+		err = datadog.UseDelegatedTokenAuth(ctx, &localVarHeaderParams, a.Client.Cfg.DelegatedTokenConfig)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		datadog.SetAuthKeys(
+			ctx,
+			&localVarHeaderParams,
+			[2]string{"apiKeyAuth", "DD-API-KEY"},
+			[2]string{"appKeyAuth", "DD-APPLICATION-KEY"},
+		)
+	}
+	req, err := a.Client.PrepareRequest(ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	localVarHTTPResponse, err := a.Client.CallAPI(req)
+	if err != nil || localVarHTTPResponse == nil {
+		return localVarHTTPResponse, err
+	}
+
+	localVarBody, err := datadog.ReadBody(localVarHTTPResponse)
+	if err != nil {
+		return localVarHTTPResponse, err
+	}
+
+	if localVarHTTPResponse.StatusCode >= 300 {
+		newErr := datadog.GenericOpenAPIError{
+			ErrorBody:    localVarBody,
+			ErrorMessage: localVarHTTPResponse.Status,
+		}
+		if localVarHTTPResponse.StatusCode == 429 {
+			var v APIErrorResponse
+			err = a.Client.Decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type"))
+			if err != nil {
+				return localVarHTTPResponse, newErr
+			}
+			newErr.ErrorModel = v
+		}
+		return localVarHTTPResponse, newErr
+	}
+
+	return localVarHTTPResponse, nil
+}
+
+// NewStaticAnalysisApi Returns NewStaticAnalysisApi.
+func NewStaticAnalysisApi(client *datadog.APIClient) *StaticAnalysisApi {
+	return &StaticAnalysisApi{
+		Client: client,
+	}
+}

api/datadogV2/doc.go

@@ -588,6 +588,8 @@
 //   - [SpansMetricsApi.GetSpansMetric]
 //   - [SpansMetricsApi.ListSpansMetrics]
 //   - [SpansMetricsApi.UpdateSpansMetric]
+//   - [StaticAnalysisApi.CreateSCAResolveVulnerableSymbols]
+//   - [StaticAnalysisApi.CreateSCAResult]
 //   - [SyntheticsApi.GetOnDemandConcurrencyCap]
 //   - [SyntheticsApi.SetOnDemandConcurrencyCap]
 //   - [TeamsApi.AddMemberTeam]