diff --git a/deepfence_agent/plugins/YaraHunter b/deepfence_agent/plugins/YaraHunter index 4dd2a6e0a0..2188d5b5a6 160000 --- a/deepfence_agent/plugins/YaraHunter +++ b/deepfence_agent/plugins/YaraHunter @@ -1 +1 @@ -Subproject commit 4dd2a6e0a0e2ad3a1fdaa30c078ae264eb151750 +Subproject commit 2188d5b5a681812fe388be01c23d003bf53523fc diff --git a/deepfence_agent/tools/apache/scope/probe/appclient/openapi_client.go b/deepfence_agent/tools/apache/scope/probe/appclient/openapi_client.go index 4e8f93d77d..c93771ed90 100644 --- a/deepfence_agent/tools/apache/scope/probe/appclient/openapi_client.go +++ b/deepfence_agent/tools/apache/scope/probe/appclient/openapi_client.go @@ -109,12 +109,10 @@ func (oc OpenapiClient) Publish(r report.Report) error { return err } - payload := string(buf) - req := oc.client.TopologyApi.IngestAgentReport(context.Background()) req = req.ApiDocsRawReport(openapi.ApiDocsRawReport{ - Payload: &payload, + Payload: string(buf), }) ctl, _, err := oc.client.TopologyApi.IngestAgentReportExecute(req) diff --git a/deepfence_server/apiDocs/operation.go b/deepfence_server/apiDocs/operation.go index 635f71b873..ffe064a064 100644 --- a/deepfence_server/apiDocs/operation.go +++ b/deepfence_server/apiDocs/operation.go @@ -11,11 +11,11 @@ import ( ) type RawReport struct { - Payload string `json:"payload"` + Payload string `json:"payload" required:"true"` } type ScanTrigger struct { - NodeId string `json:"node_id"` + NodeId string `json:"node_id" required:"true"` } func (d *OpenApiDocs) AddUserAuthOperations() { diff --git a/deepfence_server_client/.openapi-generator/FILES b/deepfence_server_client/.openapi-generator/FILES index cdbe8b6077..4f749b322f 100644 --- a/deepfence_server_client/.openapi-generator/FILES +++ b/deepfence_server_client/.openapi-generator/FILES @@ -6,6 +6,7 @@ api_authentication.go api_cloud_compliance.go api_cloud_resources.go api_compliance.go +api_malware_scan.go api_secret_scan.go api_threat.go api_topology.go @@ -27,6 +28,7 @@ docs/IngestersCloudResource.md docs/IngestersComplianceDoc.md docs/IngestersDfCveStruct.md docs/IngestersSecret.md +docs/MalwareScanApi.md docs/ModelApiAuthRequest.md docs/ModelLoginRequest.md docs/ModelResponse.md diff --git a/deepfence_server_client/README.md b/deepfence_server_client/README.md index f6d999ec6e..d6d42307ed 100644 --- a/deepfence_server_client/README.md +++ b/deepfence_server_client/README.md @@ -79,15 +79,20 @@ All URIs are relative to *http://localhost* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- -*AuthenticationApi* | [**AuthToken**](docs/AuthenticationApi.md#authtoken) | **Post** /deepfence/auth/token | API Auth Token +*AuthenticationApi* | [**AuthToken**](docs/AuthenticationApi.md#authtoken) | **Post** /deepfence/auth/token | Get Access Token for API Token +*AuthenticationApi* | [**AuthTokenRefresh**](docs/AuthenticationApi.md#authtokenrefresh) | **Post** /deepfence/auth/token/refresh | Refresh access token *AuthenticationApi* | [**Login**](docs/AuthenticationApi.md#login) | **Post** /deepfence/user/login | Login API *AuthenticationApi* | [**Logout**](docs/AuthenticationApi.md#logout) | **Post** /deepfence/user/logout | Logout API *CloudComplianceApi* | [**IngestCloudCompliances**](docs/CloudComplianceApi.md#ingestcloudcompliances) | **Post** /deepfence/ingest/cloud-compliance | Ingest Cloud Compliances *CloudResourcesApi* | [**IngestCloudResources**](docs/CloudResourcesApi.md#ingestcloudresources) | **Post** /deepfence/ingest/cloud-resources | Ingest Cloud resources *ComplianceApi* | [**IngestCompliances**](docs/ComplianceApi.md#ingestcompliances) | **Post** /deepfence/ingest/compliance | Ingest Compliances -*ComplianceApi* | [**StartComplianceScan**](docs/ComplianceApi.md#startcompliancescan) | **Get** /deepfence/scan/start/compliances | Start Compliance Scan +*ComplianceApi* | [**StartComplianceScan**](docs/ComplianceApi.md#startcompliancescan) | **Get** /deepfence/scan/start/compliance | Start Compliance Scan +*ComplianceApi* | [**StopComplianceScan**](docs/ComplianceApi.md#stopcompliancescan) | **Get** /deepfence/scan/stop/compliance | Stop Compliance Scan +*MalwareScanApi* | [**StartMalwareScan**](docs/MalwareScanApi.md#startmalwarescan) | **Get** /deepfence/scan/start/malware | Start Malware Scan +*MalwareScanApi* | [**StopMalwareScan**](docs/MalwareScanApi.md#stopmalwarescan) | **Get** /deepfence/scan/stop/malware | Stop Malware Scan *SecretScanApi* | [**IngestSecrets**](docs/SecretScanApi.md#ingestsecrets) | **Post** /deepfence/ingest/secrets | Ingest Secrets -*SecretScanApi* | [**StartSecretScan**](docs/SecretScanApi.md#startsecretscan) | **Get** /deepfence/scan/start/secrets | Start Secret Scan +*SecretScanApi* | [**StartSecretScan**](docs/SecretScanApi.md#startsecretscan) | **Get** /deepfence/scan/start/secret | Start Secret Scan +*SecretScanApi* | [**StopSecretScan**](docs/SecretScanApi.md#stopsecretscan) | **Get** /deepfence/scan/stop/secret | Stop Secret Scan *ThreatApi* | [**GetThreatGraph**](docs/ThreatApi.md#getthreatgraph) | **Get** /deepfence/graph/threat | Get Threat Graph *TopologyApi* | [**GetTopologyGraph**](docs/TopologyApi.md#gettopologygraph) | **Get** /deepfence/graph/topology | Get Topology Graph *TopologyApi* | [**IngestAgentReport**](docs/TopologyApi.md#ingestagentreport) | **Post** /deepfence/ingest/report | Ingest Topology Data @@ -97,7 +102,8 @@ Class | Method | HTTP request | Description *UserApi* | [**RegisterUser**](docs/UserApi.md#registeruser) | **Post** /deepfence/user/register | Register User *UserApi* | [**UpdateCurrentUser**](docs/UserApi.md#updatecurrentuser) | **Put** /deepfence/user | Update Current User *VulnerabilityApi* | [**IngestCVEs**](docs/VulnerabilityApi.md#ingestcves) | **Post** /deepfence/ingest/cves | Ingest CVEs -*VulnerabilityApi* | [**StartCVEScan**](docs/VulnerabilityApi.md#startcvescan) | **Get** /deepfence/scan/start/cves | Start CVE Scan +*VulnerabilityApi* | [**StartVulnerabilityScan**](docs/VulnerabilityApi.md#startvulnerabilityscan) | **Get** /deepfence/scan/start/vulnerability | Start CVE Scan +*VulnerabilityApi* | [**StopVulnerabilityScan**](docs/VulnerabilityApi.md#stopvulnerabilityscan) | **Get** /deepfence/scan/stop/vulnerability | Stop CVE Scan ## Documentation For Models diff --git a/deepfence_server_client/api/openapi.yaml b/deepfence_server_client/api/openapi.yaml index d160296cd2..bce52aaac9 100644 --- a/deepfence_server_client/api/openapi.yaml +++ b/deepfence_server_client/api/openapi.yaml @@ -64,7 +64,8 @@ paths: - User /deepfence/auth/token: post: - description: Get auth token for API access + description: "Get access token for programmatic API access, by providing API\ + \ Token" operationId: authToken requestBody: content: @@ -94,7 +95,39 @@ paths: schema: $ref: '#/components/schemas/ApiDocsFailureResponse' description: Internal Server Error - summary: API Auth Token + summary: Get Access Token for API Token + tags: + - Authentication + /deepfence/auth/token/refresh: + post: + description: Reissue access token using refresh token + operationId: authTokenRefresh + responses: + "200": + content: + application/json: + schema: + $ref: '#/components/schemas/ModelResponse' + description: OK + "400": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiDocsBadRequestResponse' + description: Bad Request + "401": + description: Unauthorized + "403": + description: Forbidden + "500": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiDocsFailureResponse' + description: Internal Server Error + security: + - bearer_token: [] + summary: Refresh access token tags: - Authentication /deepfence/graph/threat: @@ -378,13 +411,13 @@ paths: summary: Ingest Secrets tags: - Secret Scan - /deepfence/scan/start/compliances: + /deepfence/scan/start/compliance: get: - description: Start Compliance Scan on agent + description: Start Compliance Scan on agent or registry operationId: startComplianceScan responses: - "200": - description: OK + "202": + description: Accepted "400": content: application/json: @@ -406,13 +439,13 @@ paths: summary: Start Compliance Scan tags: - Compliance - /deepfence/scan/start/cves: + /deepfence/scan/start/malware: get: - description: Start CVE Scan on agent - operationId: startCVEScan + description: Start Malware Scan on agent or registry + operationId: startMalwareScan responses: - "200": - description: OK + "202": + description: Accepted "400": content: application/json: @@ -431,16 +464,16 @@ paths: description: Internal Server Error security: - bearer_token: [] - summary: Start CVE Scan + summary: Start Malware Scan tags: - - Vulnerability - /deepfence/scan/start/secrets: + - Malware Scan + /deepfence/scan/start/secret: get: - description: Start Secret Scan on agent + description: Start Secret Scan on agent or registry operationId: startSecretScan responses: - "200": - description: OK + "202": + description: Accepted "400": content: application/json: @@ -462,6 +495,146 @@ paths: summary: Start Secret Scan tags: - Secret Scan + /deepfence/scan/start/vulnerability: + get: + description: Start CVE Scan on agent or registry + operationId: startVulnerabilityScan + responses: + "202": + description: Accepted + "400": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiDocsBadRequestResponse' + description: Bad Request + "401": + description: Unauthorized + "403": + description: Forbidden + "500": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiDocsFailureResponse' + description: Internal Server Error + security: + - bearer_token: [] + summary: Start CVE Scan + tags: + - Vulnerability + /deepfence/scan/stop/compliance: + get: + description: Stop Compliance Scan on agent or registry + operationId: stopComplianceScan + responses: + "202": + description: Accepted + "400": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiDocsBadRequestResponse' + description: Bad Request + "401": + description: Unauthorized + "403": + description: Forbidden + "500": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiDocsFailureResponse' + description: Internal Server Error + security: + - bearer_token: [] + summary: Stop Compliance Scan + tags: + - Compliance + /deepfence/scan/stop/malware: + get: + description: Stop Malware Scan on agent or registry + operationId: stopMalwareScan + responses: + "202": + description: Accepted + "400": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiDocsBadRequestResponse' + description: Bad Request + "401": + description: Unauthorized + "403": + description: Forbidden + "500": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiDocsFailureResponse' + description: Internal Server Error + security: + - bearer_token: [] + summary: Stop Malware Scan + tags: + - Malware Scan + /deepfence/scan/stop/secret: + get: + description: Stop Secret Scan on agent or registry + operationId: stopSecretScan + responses: + "202": + description: Accepted + "400": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiDocsBadRequestResponse' + description: Bad Request + "401": + description: Unauthorized + "403": + description: Forbidden + "500": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiDocsFailureResponse' + description: Internal Server Error + security: + - bearer_token: [] + summary: Stop Secret Scan + tags: + - Secret Scan + /deepfence/scan/stop/vulnerability: + get: + description: Stop CVE Scan on agent or registry + operationId: stopVulnerabilityScan + responses: + "202": + description: Accepted + "400": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiDocsBadRequestResponse' + description: Bad Request + "401": + description: Unauthorized + "403": + description: Forbidden + "500": + content: + application/json: + schema: + $ref: '#/components/schemas/ApiDocsFailureResponse' + description: Internal Server Error + security: + - bearer_token: [] + summary: Stop CVE Scan + tags: + - Vulnerability /deepfence/user: delete: description: Delete logged in user @@ -682,6 +855,8 @@ components: properties: payload: type: string + required: + - payload type: object ControlsAction: example: diff --git a/deepfence_server_client/api_authentication.go b/deepfence_server_client/api_authentication.go index bc1296c5a0..bb9bee1962 100644 --- a/deepfence_server_client/api_authentication.go +++ b/deepfence_server_client/api_authentication.go @@ -39,9 +39,9 @@ func (r ApiAuthTokenRequest) Execute() (*ModelResponse, *http.Response, error) { } /* -AuthToken API Auth Token +AuthToken Get Access Token for API Token -Get auth token for API access +Get access token for programmatic API access, by providing API Token @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @return ApiAuthTokenRequest @@ -151,6 +151,126 @@ func (a *AuthenticationApiService) AuthTokenExecute(r ApiAuthTokenRequest) (*Mod return localVarReturnValue, localVarHTTPResponse, nil } +type ApiAuthTokenRefreshRequest struct { + ctx context.Context + ApiService *AuthenticationApiService +} + +func (r ApiAuthTokenRefreshRequest) Execute() (*ModelResponse, *http.Response, error) { + return r.ApiService.AuthTokenRefreshExecute(r) +} + +/* +AuthTokenRefresh Refresh access token + +Reissue access token using refresh token + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiAuthTokenRefreshRequest +*/ +func (a *AuthenticationApiService) AuthTokenRefresh(ctx context.Context) ApiAuthTokenRefreshRequest { + return ApiAuthTokenRefreshRequest{ + ApiService: a, + ctx: ctx, + } +} + +// Execute executes the request +// @return ModelResponse +func (a *AuthenticationApiService) AuthTokenRefreshExecute(r ApiAuthTokenRefreshRequest) (*ModelResponse, *http.Response, error) { + var ( + localVarHTTPMethod = http.MethodPost + localVarPostBody interface{} + formFiles []formFile + localVarReturnValue *ModelResponse + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "AuthenticationApiService.AuthTokenRefresh") + if err != nil { + return localVarReturnValue, nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/deepfence/auth/token/refresh" + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return localVarReturnValue, nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v ApiDocsBadRequestResponse + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarReturnValue, localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 500 { + var v ApiDocsFailureResponse + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: err.Error(), + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + return localVarReturnValue, localVarHTTPResponse, nil +} + type ApiLoginRequest struct { ctx context.Context ApiService *AuthenticationApiService diff --git a/deepfence_server_client/api_compliance.go b/deepfence_server_client/api_compliance.go index c7e9189a67..705e1817f5 100644 --- a/deepfence_server_client/api_compliance.go +++ b/deepfence_server_client/api_compliance.go @@ -152,7 +152,7 @@ func (r ApiStartComplianceScanRequest) Execute() (*http.Response, error) { /* StartComplianceScan Start Compliance Scan -Start Compliance Scan on agent +Start Compliance Scan on agent or registry @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @return ApiStartComplianceScanRequest @@ -177,7 +177,116 @@ func (a *ComplianceApiService) StartComplianceScanExecute(r ApiStartComplianceSc return nil, &GenericOpenAPIError{error: err.Error()} } - localVarPath := localBasePath + "/deepfence/scan/start/compliances" + localVarPath := localBasePath + "/deepfence/scan/start/compliance" + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarHTTPResponse, err + } + + localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v ApiDocsBadRequestResponse + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 500 { + var v ApiDocsFailureResponse + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarHTTPResponse, newErr + } + + return localVarHTTPResponse, nil +} + +type ApiStopComplianceScanRequest struct { + ctx context.Context + ApiService *ComplianceApiService +} + +func (r ApiStopComplianceScanRequest) Execute() (*http.Response, error) { + return r.ApiService.StopComplianceScanExecute(r) +} + +/* +StopComplianceScan Stop Compliance Scan + +Stop Compliance Scan on agent or registry + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiStopComplianceScanRequest +*/ +func (a *ComplianceApiService) StopComplianceScan(ctx context.Context) ApiStopComplianceScanRequest { + return ApiStopComplianceScanRequest{ + ApiService: a, + ctx: ctx, + } +} + +// Execute executes the request +func (a *ComplianceApiService) StopComplianceScanExecute(r ApiStopComplianceScanRequest) (*http.Response, error) { + var ( + localVarHTTPMethod = http.MethodGet + localVarPostBody interface{} + formFiles []formFile + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "ComplianceApiService.StopComplianceScan") + if err != nil { + return nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/deepfence/scan/stop/compliance" localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} diff --git a/deepfence_server_client/api_secret_scan.go b/deepfence_server_client/api_secret_scan.go index 39ca0418d5..06eca72261 100644 --- a/deepfence_server_client/api_secret_scan.go +++ b/deepfence_server_client/api_secret_scan.go @@ -152,7 +152,7 @@ func (r ApiStartSecretScanRequest) Execute() (*http.Response, error) { /* StartSecretScan Start Secret Scan -Start Secret Scan on agent +Start Secret Scan on agent or registry @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). @return ApiStartSecretScanRequest @@ -177,7 +177,116 @@ func (a *SecretScanApiService) StartSecretScanExecute(r ApiStartSecretScanReques return nil, &GenericOpenAPIError{error: err.Error()} } - localVarPath := localBasePath + "/deepfence/scan/start/secrets" + localVarPath := localBasePath + "/deepfence/scan/start/secret" + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarHTTPResponse, err + } + + localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v ApiDocsBadRequestResponse + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 500 { + var v ApiDocsFailureResponse + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarHTTPResponse, newErr + } + + return localVarHTTPResponse, nil +} + +type ApiStopSecretScanRequest struct { + ctx context.Context + ApiService *SecretScanApiService +} + +func (r ApiStopSecretScanRequest) Execute() (*http.Response, error) { + return r.ApiService.StopSecretScanExecute(r) +} + +/* +StopSecretScan Stop Secret Scan + +Stop Secret Scan on agent or registry + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiStopSecretScanRequest +*/ +func (a *SecretScanApiService) StopSecretScan(ctx context.Context) ApiStopSecretScanRequest { + return ApiStopSecretScanRequest{ + ApiService: a, + ctx: ctx, + } +} + +// Execute executes the request +func (a *SecretScanApiService) StopSecretScanExecute(r ApiStopSecretScanRequest) (*http.Response, error) { + var ( + localVarHTTPMethod = http.MethodGet + localVarPostBody interface{} + formFiles []formFile + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "SecretScanApiService.StopSecretScan") + if err != nil { + return nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/deepfence/scan/stop/secret" localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} diff --git a/deepfence_server_client/api_vulnerability.go b/deepfence_server_client/api_vulnerability.go index 3d9684ef4b..fd16aea313 100644 --- a/deepfence_server_client/api_vulnerability.go +++ b/deepfence_server_client/api_vulnerability.go @@ -140,44 +140,153 @@ func (a *VulnerabilityApiService) IngestCVEsExecute(r ApiIngestCVEsRequest) (*ht return localVarHTTPResponse, nil } -type ApiStartCVEScanRequest struct { +type ApiStartVulnerabilityScanRequest struct { ctx context.Context ApiService *VulnerabilityApiService } -func (r ApiStartCVEScanRequest) Execute() (*http.Response, error) { - return r.ApiService.StartCVEScanExecute(r) +func (r ApiStartVulnerabilityScanRequest) Execute() (*http.Response, error) { + return r.ApiService.StartVulnerabilityScanExecute(r) } /* -StartCVEScan Start CVE Scan +StartVulnerabilityScan Start CVE Scan -Start CVE Scan on agent +Start CVE Scan on agent or registry @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). - @return ApiStartCVEScanRequest + @return ApiStartVulnerabilityScanRequest */ -func (a *VulnerabilityApiService) StartCVEScan(ctx context.Context) ApiStartCVEScanRequest { - return ApiStartCVEScanRequest{ +func (a *VulnerabilityApiService) StartVulnerabilityScan(ctx context.Context) ApiStartVulnerabilityScanRequest { + return ApiStartVulnerabilityScanRequest{ ApiService: a, ctx: ctx, } } // Execute executes the request -func (a *VulnerabilityApiService) StartCVEScanExecute(r ApiStartCVEScanRequest) (*http.Response, error) { +func (a *VulnerabilityApiService) StartVulnerabilityScanExecute(r ApiStartVulnerabilityScanRequest) (*http.Response, error) { var ( localVarHTTPMethod = http.MethodGet localVarPostBody interface{} formFiles []formFile ) - localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VulnerabilityApiService.StartCVEScan") + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VulnerabilityApiService.StartVulnerabilityScan") if err != nil { return nil, &GenericOpenAPIError{error: err.Error()} } - localVarPath := localBasePath + "/deepfence/scan/start/cves" + localVarPath := localBasePath + "/deepfence/scan/start/vulnerability" + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := url.Values{} + localVarFormParams := url.Values{} + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) + if err != nil { + return nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarHTTPResponse, err + } + + localVarBody, err := ioutil.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = ioutil.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := &GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v ApiDocsBadRequestResponse + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 500 { + var v ApiDocsFailureResponse + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) + newErr.model = v + } + return localVarHTTPResponse, newErr + } + + return localVarHTTPResponse, nil +} + +type ApiStopVulnerabilityScanRequest struct { + ctx context.Context + ApiService *VulnerabilityApiService +} + +func (r ApiStopVulnerabilityScanRequest) Execute() (*http.Response, error) { + return r.ApiService.StopVulnerabilityScanExecute(r) +} + +/* +StopVulnerabilityScan Stop CVE Scan + +Stop CVE Scan on agent or registry + + @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + @return ApiStopVulnerabilityScanRequest +*/ +func (a *VulnerabilityApiService) StopVulnerabilityScan(ctx context.Context) ApiStopVulnerabilityScanRequest { + return ApiStopVulnerabilityScanRequest{ + ApiService: a, + ctx: ctx, + } +} + +// Execute executes the request +func (a *VulnerabilityApiService) StopVulnerabilityScanExecute(r ApiStopVulnerabilityScanRequest) (*http.Response, error) { + var ( + localVarHTTPMethod = http.MethodGet + localVarPostBody interface{} + formFiles []formFile + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "VulnerabilityApiService.StopVulnerabilityScan") + if err != nil { + return nil, &GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/deepfence/scan/stop/vulnerability" localVarHeaderParams := make(map[string]string) localVarQueryParams := url.Values{} diff --git a/deepfence_server_client/client.go b/deepfence_server_client/client.go index ae6b9e3a49..504b1e7de4 100644 --- a/deepfence_server_client/client.go +++ b/deepfence_server_client/client.go @@ -59,6 +59,8 @@ type APIClient struct { ComplianceApi *ComplianceApiService + MalwareScanApi *MalwareScanApiService + SecretScanApi *SecretScanApiService ThreatApi *ThreatApiService @@ -90,6 +92,7 @@ func NewAPIClient(cfg *Configuration) *APIClient { c.CloudComplianceApi = (*CloudComplianceApiService)(&c.common) c.CloudResourcesApi = (*CloudResourcesApiService)(&c.common) c.ComplianceApi = (*ComplianceApiService)(&c.common) + c.MalwareScanApi = (*MalwareScanApiService)(&c.common) c.SecretScanApi = (*SecretScanApiService)(&c.common) c.ThreatApi = (*ThreatApiService)(&c.common) c.TopologyApi = (*TopologyApiService)(&c.common) diff --git a/deepfence_server_client/docs/ApiDocsRawReport.md b/deepfence_server_client/docs/ApiDocsRawReport.md index 04e0b6f4d2..9a7cfb738e 100644 --- a/deepfence_server_client/docs/ApiDocsRawReport.md +++ b/deepfence_server_client/docs/ApiDocsRawReport.md @@ -4,13 +4,13 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**Payload** | Pointer to **string** | | [optional] +**Payload** | **string** | | ## Methods ### NewApiDocsRawReport -`func NewApiDocsRawReport() *ApiDocsRawReport` +`func NewApiDocsRawReport(payload string, ) *ApiDocsRawReport` NewApiDocsRawReport instantiates a new ApiDocsRawReport object This constructor will assign default values to properties that have it defined, @@ -44,11 +44,6 @@ and a boolean to check if the value has been set. SetPayload sets Payload field to given value. -### HasPayload - -`func (o *ApiDocsRawReport) HasPayload() bool` - -HasPayload returns a boolean if a field has been set. [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/deepfence_server_client/docs/AuthenticationApi.md b/deepfence_server_client/docs/AuthenticationApi.md index 5251a72e5e..68bbb0d233 100644 --- a/deepfence_server_client/docs/AuthenticationApi.md +++ b/deepfence_server_client/docs/AuthenticationApi.md @@ -4,7 +4,8 @@ All URIs are relative to *http://localhost* Method | HTTP request | Description ------------- | ------------- | ------------- -[**AuthToken**](AuthenticationApi.md#AuthToken) | **Post** /deepfence/auth/token | API Auth Token +[**AuthToken**](AuthenticationApi.md#AuthToken) | **Post** /deepfence/auth/token | Get Access Token for API Token +[**AuthTokenRefresh**](AuthenticationApi.md#AuthTokenRefresh) | **Post** /deepfence/auth/token/refresh | Refresh access token [**Login**](AuthenticationApi.md#Login) | **Post** /deepfence/user/login | Login API [**Logout**](AuthenticationApi.md#Logout) | **Post** /deepfence/user/logout | Logout API @@ -14,7 +15,7 @@ Method | HTTP request | Description > ModelResponse AuthToken(ctx).ModelApiAuthRequest(modelApiAuthRequest).Execute() -API Auth Token +Get Access Token for API Token @@ -76,6 +77,67 @@ No authorization required [[Back to README]](../README.md) +## AuthTokenRefresh + +> ModelResponse AuthTokenRefresh(ctx).Execute() + +Refresh access token + + + +### Example + +```go +package main + +import ( + "context" + "fmt" + "os" + openapiclient "./openapi" +) + +func main() { + + configuration := openapiclient.NewConfiguration() + apiClient := openapiclient.NewAPIClient(configuration) + resp, r, err := apiClient.AuthenticationApi.AuthTokenRefresh(context.Background()).Execute() + if err != nil { + fmt.Fprintf(os.Stderr, "Error when calling `AuthenticationApi.AuthTokenRefresh``: %v\n", err) + fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) + } + // response from `AuthTokenRefresh`: ModelResponse + fmt.Fprintf(os.Stdout, "Response from `AuthenticationApi.AuthTokenRefresh`: %v\n", resp) +} +``` + +### Path Parameters + +This endpoint does not need any parameter. + +### Other Parameters + +Other parameters are passed through a pointer to a apiAuthTokenRefreshRequest struct via the builder pattern + + +### Return type + +[**ModelResponse**](ModelResponse.md) + +### Authorization + +[bearer_token](../README.md#bearer_token) + +### HTTP request headers + +- **Content-Type**: Not defined +- **Accept**: application/json + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) +[[Back to Model list]](../README.md#documentation-for-models) +[[Back to README]](../README.md) + + ## Login > ModelResponse Login(ctx).ModelLoginRequest(modelLoginRequest).Execute() diff --git a/deepfence_server_client/docs/ComplianceApi.md b/deepfence_server_client/docs/ComplianceApi.md index 4fe8dcd289..9669c8d95e 100644 --- a/deepfence_server_client/docs/ComplianceApi.md +++ b/deepfence_server_client/docs/ComplianceApi.md @@ -5,7 +5,8 @@ All URIs are relative to *http://localhost* Method | HTTP request | Description ------------- | ------------- | ------------- [**IngestCompliances**](ComplianceApi.md#IngestCompliances) | **Post** /deepfence/ingest/compliance | Ingest Compliances -[**StartComplianceScan**](ComplianceApi.md#StartComplianceScan) | **Get** /deepfence/scan/start/compliances | Start Compliance Scan +[**StartComplianceScan**](ComplianceApi.md#StartComplianceScan) | **Get** /deepfence/scan/start/compliance | Start Compliance Scan +[**StopComplianceScan**](ComplianceApi.md#StopComplianceScan) | **Get** /deepfence/scan/stop/compliance | Stop Compliance Scan @@ -131,3 +132,62 @@ Other parameters are passed through a pointer to a apiStartComplianceScanRequest [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + +## StopComplianceScan + +> StopComplianceScan(ctx).Execute() + +Stop Compliance Scan + + + +### Example + +```go +package main + +import ( + "context" + "fmt" + "os" + openapiclient "./openapi" +) + +func main() { + + configuration := openapiclient.NewConfiguration() + apiClient := openapiclient.NewAPIClient(configuration) + resp, r, err := apiClient.ComplianceApi.StopComplianceScan(context.Background()).Execute() + if err != nil { + fmt.Fprintf(os.Stderr, "Error when calling `ComplianceApi.StopComplianceScan``: %v\n", err) + fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) + } +} +``` + +### Path Parameters + +This endpoint does not need any parameter. + +### Other Parameters + +Other parameters are passed through a pointer to a apiStopComplianceScanRequest struct via the builder pattern + + +### Return type + + (empty response body) + +### Authorization + +[bearer_token](../README.md#bearer_token) + +### HTTP request headers + +- **Content-Type**: Not defined +- **Accept**: application/json + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) +[[Back to Model list]](../README.md#documentation-for-models) +[[Back to README]](../README.md) + diff --git a/deepfence_server_client/docs/SecretScanApi.md b/deepfence_server_client/docs/SecretScanApi.md index cf007e56c3..f6b69df5a1 100644 --- a/deepfence_server_client/docs/SecretScanApi.md +++ b/deepfence_server_client/docs/SecretScanApi.md @@ -5,7 +5,8 @@ All URIs are relative to *http://localhost* Method | HTTP request | Description ------------- | ------------- | ------------- [**IngestSecrets**](SecretScanApi.md#IngestSecrets) | **Post** /deepfence/ingest/secrets | Ingest Secrets -[**StartSecretScan**](SecretScanApi.md#StartSecretScan) | **Get** /deepfence/scan/start/secrets | Start Secret Scan +[**StartSecretScan**](SecretScanApi.md#StartSecretScan) | **Get** /deepfence/scan/start/secret | Start Secret Scan +[**StopSecretScan**](SecretScanApi.md#StopSecretScan) | **Get** /deepfence/scan/stop/secret | Stop Secret Scan @@ -131,3 +132,62 @@ Other parameters are passed through a pointer to a apiStartSecretScanRequest str [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + +## StopSecretScan + +> StopSecretScan(ctx).Execute() + +Stop Secret Scan + + + +### Example + +```go +package main + +import ( + "context" + "fmt" + "os" + openapiclient "./openapi" +) + +func main() { + + configuration := openapiclient.NewConfiguration() + apiClient := openapiclient.NewAPIClient(configuration) + resp, r, err := apiClient.SecretScanApi.StopSecretScan(context.Background()).Execute() + if err != nil { + fmt.Fprintf(os.Stderr, "Error when calling `SecretScanApi.StopSecretScan``: %v\n", err) + fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) + } +} +``` + +### Path Parameters + +This endpoint does not need any parameter. + +### Other Parameters + +Other parameters are passed through a pointer to a apiStopSecretScanRequest struct via the builder pattern + + +### Return type + + (empty response body) + +### Authorization + +[bearer_token](../README.md#bearer_token) + +### HTTP request headers + +- **Content-Type**: Not defined +- **Accept**: application/json + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) +[[Back to Model list]](../README.md#documentation-for-models) +[[Back to README]](../README.md) + diff --git a/deepfence_server_client/docs/TopologyApi.md b/deepfence_server_client/docs/TopologyApi.md index 7ed3e4ceec..283e8b4748 100644 --- a/deepfence_server_client/docs/TopologyApi.md +++ b/deepfence_server_client/docs/TopologyApi.md @@ -91,7 +91,7 @@ import ( ) func main() { - apiDocsRawReport := *openapiclient.NewApiDocsRawReport() // ApiDocsRawReport | (optional) + apiDocsRawReport := *openapiclient.NewApiDocsRawReport("Payload_example") // ApiDocsRawReport | (optional) configuration := openapiclient.NewConfiguration() apiClient := openapiclient.NewAPIClient(configuration) diff --git a/deepfence_server_client/docs/VulnerabilityApi.md b/deepfence_server_client/docs/VulnerabilityApi.md index b226e7351e..70d5c28df3 100644 --- a/deepfence_server_client/docs/VulnerabilityApi.md +++ b/deepfence_server_client/docs/VulnerabilityApi.md @@ -5,7 +5,8 @@ All URIs are relative to *http://localhost* Method | HTTP request | Description ------------- | ------------- | ------------- [**IngestCVEs**](VulnerabilityApi.md#IngestCVEs) | **Post** /deepfence/ingest/cves | Ingest CVEs -[**StartCVEScan**](VulnerabilityApi.md#StartCVEScan) | **Get** /deepfence/scan/start/cves | Start CVE Scan +[**StartVulnerabilityScan**](VulnerabilityApi.md#StartVulnerabilityScan) | **Get** /deepfence/scan/start/vulnerability | Start CVE Scan +[**StopVulnerabilityScan**](VulnerabilityApi.md#StopVulnerabilityScan) | **Get** /deepfence/scan/stop/vulnerability | Stop CVE Scan @@ -73,9 +74,9 @@ Name | Type | Description | Notes [[Back to README]](../README.md) -## StartCVEScan +## StartVulnerabilityScan -> StartCVEScan(ctx).Execute() +> StartVulnerabilityScan(ctx).Execute() Start CVE Scan @@ -97,9 +98,9 @@ func main() { configuration := openapiclient.NewConfiguration() apiClient := openapiclient.NewAPIClient(configuration) - resp, r, err := apiClient.VulnerabilityApi.StartCVEScan(context.Background()).Execute() + resp, r, err := apiClient.VulnerabilityApi.StartVulnerabilityScan(context.Background()).Execute() if err != nil { - fmt.Fprintf(os.Stderr, "Error when calling `VulnerabilityApi.StartCVEScan``: %v\n", err) + fmt.Fprintf(os.Stderr, "Error when calling `VulnerabilityApi.StartVulnerabilityScan``: %v\n", err) fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) } } @@ -111,7 +112,66 @@ This endpoint does not need any parameter. ### Other Parameters -Other parameters are passed through a pointer to a apiStartCVEScanRequest struct via the builder pattern +Other parameters are passed through a pointer to a apiStartVulnerabilityScanRequest struct via the builder pattern + + +### Return type + + (empty response body) + +### Authorization + +[bearer_token](../README.md#bearer_token) + +### HTTP request headers + +- **Content-Type**: Not defined +- **Accept**: application/json + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) +[[Back to Model list]](../README.md#documentation-for-models) +[[Back to README]](../README.md) + + +## StopVulnerabilityScan + +> StopVulnerabilityScan(ctx).Execute() + +Stop CVE Scan + + + +### Example + +```go +package main + +import ( + "context" + "fmt" + "os" + openapiclient "./openapi" +) + +func main() { + + configuration := openapiclient.NewConfiguration() + apiClient := openapiclient.NewAPIClient(configuration) + resp, r, err := apiClient.VulnerabilityApi.StopVulnerabilityScan(context.Background()).Execute() + if err != nil { + fmt.Fprintf(os.Stderr, "Error when calling `VulnerabilityApi.StopVulnerabilityScan``: %v\n", err) + fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r) + } +} +``` + +### Path Parameters + +This endpoint does not need any parameter. + +### Other Parameters + +Other parameters are passed through a pointer to a apiStopVulnerabilityScanRequest struct via the builder pattern ### Return type diff --git a/deepfence_server_client/model_api_docs_raw_report.go b/deepfence_server_client/model_api_docs_raw_report.go index b121d294bb..eeb950f7f8 100644 --- a/deepfence_server_client/model_api_docs_raw_report.go +++ b/deepfence_server_client/model_api_docs_raw_report.go @@ -20,15 +20,16 @@ var _ MappedNullable = &ApiDocsRawReport{} // ApiDocsRawReport struct for ApiDocsRawReport type ApiDocsRawReport struct { - Payload *string `json:"payload,omitempty"` + Payload string `json:"payload"` } // NewApiDocsRawReport instantiates a new ApiDocsRawReport object // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewApiDocsRawReport() *ApiDocsRawReport { +func NewApiDocsRawReport(payload string) *ApiDocsRawReport { this := ApiDocsRawReport{} + this.Payload = payload return &this } @@ -40,36 +41,28 @@ func NewApiDocsRawReportWithDefaults() *ApiDocsRawReport { return &this } -// GetPayload returns the Payload field value if set, zero value otherwise. +// GetPayload returns the Payload field value func (o *ApiDocsRawReport) GetPayload() string { - if o == nil || isNil(o.Payload) { + if o == nil { var ret string return ret } - return *o.Payload + + return o.Payload } -// GetPayloadOk returns a tuple with the Payload field value if set, nil otherwise +// GetPayloadOk returns a tuple with the Payload field value // and a boolean to check if the value has been set. func (o *ApiDocsRawReport) GetPayloadOk() (*string, bool) { - if o == nil || isNil(o.Payload) { + if o == nil { return nil, false } - return o.Payload, true -} - -// HasPayload returns a boolean if a field has been set. -func (o *ApiDocsRawReport) HasPayload() bool { - if o != nil && !isNil(o.Payload) { - return true - } - - return false + return &o.Payload, true } -// SetPayload gets a reference to the given string and assigns it to the Payload field. +// SetPayload sets field value func (o *ApiDocsRawReport) SetPayload(v string) { - o.Payload = &v + o.Payload = v } func (o ApiDocsRawReport) MarshalJSON() ([]byte, error) { @@ -82,9 +75,7 @@ func (o ApiDocsRawReport) MarshalJSON() ([]byte, error) { func (o ApiDocsRawReport) ToMap() (map[string]interface{}, error) { toSerialize := map[string]interface{}{} - if !isNil(o.Payload) { - toSerialize["payload"] = o.Payload - } + toSerialize["payload"] = o.Payload return toSerialize, nil }