Merge master into datadog-api-spec/test/rberger/SYA-1153/synthetics-required-fields

Author: api-clients-generation-pipeline[bot]

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.5.1.dev2",
-            "regenerated": "2022-01-13 12:57:54.756060",
-            "spec_repo_commit": "1ae19d0"
+            "regenerated": "2022-01-17 16:31:46.250333",
+            "spec_repo_commit": "9f83d50"
         },
         "v2": {
             "apigentools_version": "1.5.1.dev2",
-            "regenerated": "2022-01-13 12:57:54.780238",
-            "spec_repo_commit": "1ae19d0"
+            "regenerated": "2022-01-17 16:31:46.277137",
+            "spec_repo_commit": "9f83d50"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -10107,20 +10107,122 @@ components:
       - NETWORK_HOP
       - RECEIVED_MESSAGE
     SyntheticsBasicAuth:
+      description: Object to handle basic authentication when performing the test.
+      oneOf:
+      - $ref: '#/components/schemas/SyntheticsBasicAuthWeb'
+      - $ref: '#/components/schemas/SyntheticsBasicAuthSigv4'
+      - $ref: '#/components/schemas/SyntheticsBasicAuthNTLM'
+      type: object
+    SyntheticsBasicAuthNTLM:
+      description: Object to handle `NTLM` authentication when performing the test.
+      properties:
+        domain:
+          description: Domain for the authentication to use when performing the test.
+          example: DOMAINNAME
+          type: string
+        password:
+          description: Password for the authentication to use when performing the
+            test.
+          example: examplepassword
+          type: string
+        type:
+          $ref: '#/components/schemas/SyntheticsBasicAuthNTLMType'
+        username:
+          description: Username for the authentication to use when performing the
+            test.
+          example: joedoe
+          type: string
+        workstation:
+          description: Workstation for the authentication to use when performing the
+            test.
+          example: ''
+          type: string
+      required:
+      - type
+      type: object
+    SyntheticsBasicAuthNTLMType:
+      default: ntlm
+      description: The type of authentication to use when performing the test.
+      enum:
+      - ntlm
+      example: ntlm
+      type: string
+      x-enum-varnames:
+      - NTLM
+    SyntheticsBasicAuthSigv4:
+      description: Object to handle `SIGV4` authentication when performing the test.
+      properties:
+        accessKey:
+          description: Access key for the `SIGV4` authentication.
+          example: AKIAIOSFODNN7EXAMPLE
+          type: string
+        region:
+          description: Region for the `SIGV4` authentication.
+          example: us-east-1
+          type: string
+        secretKey:
+          description: Secret key for the `SIGV4` authentication.
+          example: wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY
+          type: string
+        serviceName:
+          description: Service name for the `SIGV4` authentication.
+          example: execute-api
+          type: string
+        sessionToken:
+          description: Session token for the `SIGV4` authentication.
+          example: 'AQoEXAMPLEH4aoAH0gNCAPyJxz4BlCFFxWNE1OPTgk5TthT+FvwqnKwRcOIfrRh3c/L
+
+            To6UDdyJwOOvEVPvLXCrrrUtdnniCEXAMPLE/IvU1dYUg2RVAJBanLiHb4IgRmpRV3z
+
+            rkuWJOgQs8IZZaIv2BXIa2R4OlgkBN9bkUDNCJiBeb/AXlzBBko7b15fjrBs2+cTQtp
+
+            Z3CYWFXG8C5zqx37wnOE49mRl/+OtkIKGO7fAE
+
+            '
+          type: string
+        type:
+          $ref: '#/components/schemas/SyntheticsBasicAuthSigv4Type'
+      required:
+      - accessKey
+      - secretKey
+      - type
+      type: object
+    SyntheticsBasicAuthSigv4Type:
+      default: sigv4
+      description: The type of authentication to use when performing the test.
+      enum:
+      - sigv4
+      example: sigv4
+      type: string
+      x-enum-varnames:
+      - SIGV4
+    SyntheticsBasicAuthWeb:
       description: Object to handle basic authentication when performing the test.
       properties:
         password:
           description: Password to use for the basic authentication.
           example: ''
           type: string
+        type:
+          $ref: '#/components/schemas/SyntheticsBasicAuthWebType'
         username:
           description: Username to use for the basic authentication.
           example: ''
           type: string
       required:
       - password
       - username
+      - type
       type: object
+    SyntheticsBasicAuthWebType:
+      default: web
+      description: The type of basic authentication to use when performing the test.
+      enum:
+      - web
+      example: web
+      type: string
+      x-enum-varnames:
+      - WEB
     SyntheticsBatchDetails:
       description: Details about a batch response.
       properties:
@@ -11583,6 +11685,8 @@ components:
           description: Port to use when performing the test.
           format: int64
           type: integer
+        proxy:
+          $ref: '#/components/schemas/SyntheticsTestRequestProxy'
         query:
           description: Query to use for the test.
           type: object
@@ -11628,6 +11732,18 @@ components:
           description: Date of update of the certificate or key, ISO format.
           type: string
       type: object
+    SyntheticsTestRequestProxy:
+      description: The proxy to perform the test.
+      properties:
+        headers:
+          $ref: '#/components/schemas/SyntheticsTestHeaders'
+        url:
+          description: URL of the proxy to perform the test.
+          example: https://example.com
+          type: string
+      required:
+      - url
+      type: object
     SyntheticsTiming:
       description: 'Object containing all metrics and their values collected for a
         Synthetic API test.

.generator/schemas/v2/openapi.yaml

@@ -798,7 +798,7 @@ components:
         data:
           description: A list of Agent rules objects.
           items:
-            $ref: '#/components/schemas/CloudWorkloadSecurityAgentRuleAttributes'
+            $ref: '#/components/schemas/CloudWorkloadSecurityAgentRuleData'
           type: array
       type: object
     ContentEncoding:
@@ -8689,6 +8689,7 @@ paths:
       summary: Get the latest Cloud Workload Security policy
       tags:
       - Cloud Workload Security
+      x-menu-order: 1
       x-undo:
         type: safe
   /api/v2/security_monitoring/cloud_workload_security/agent_rules:
@@ -8714,6 +8715,7 @@ paths:
       summary: Get all Cloud Workload Security Agent rules
       tags:
       - Cloud Workload Security
+      x-menu-order: 3
       x-undo:
         type: safe
     post:
@@ -8759,6 +8761,7 @@ paths:
               \"My Agent rule\",\n      \"expression\": \"exec.file.name == \\\"sh\\\"\",\n
               \     \"enabled\": true\n     }\n  }\n}"
           step: there is a valid "agent_rule" in the system
+      x-menu-order: 4
       x-undo:
         operationId: DeleteCloudWorkloadSecurityAgentRule
         parameters:
@@ -8788,6 +8791,7 @@ paths:
       summary: Delete a Cloud Workload Security Agent rule
       tags:
       - Cloud Workload Security
+      x-menu-order: 6
       x-undo:
         type: idempotent
     get:
@@ -8816,6 +8820,7 @@ paths:
       summary: Get a Cloud Workload Security Agent rule
       tags:
       - Cloud Workload Security
+      x-menu-order: 2
       x-undo:
         type: safe
     patch:
@@ -8858,6 +8863,7 @@ paths:
       tags:
       - Cloud Workload Security
       x-codegen-request-body-name: body
+      x-menu-order: 5
       x-undo:
         type: idempotent
   /api/v2/security_monitoring/configuration/security_filters:

.generator/templates/client.mustache

@@ -156,7 +156,10 @@ func parameterToString(obj interface{}, collectionFormat string) string {
 	if reflect.TypeOf(obj).Kind() == reflect.Slice {
 		return strings.Trim(strings.Replace(fmt.Sprint(obj), " ", delimiter, -1), "[]")
 	} else if t, ok := obj.(time.Time); ok {
-		return t.Format(time.RFC3339)
+		if t.Nanosecond() == 0 {
+			return t.Format("2006-01-02T15:04:05Z07:00")
+		}
+		return t.Format("2006-01-02T15:04:05.000Z07:00")
 	}
 
 	return fmt.Sprintf("%v", obj)

.github/workflows/test.yml

@@ -1,5 +1,9 @@
 name: Run Tests
 
+env:
+  GIT_AUTHOR_EMAIL: "[email protected]"
+  GIT_AUTHOR_NAME: "ci.datadog-api-spec"
+
 on:
   pull_request:
     branches:
@@ -12,10 +16,22 @@ concurrency:
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
-    if: false == startsWith(github.event.pull_request.head.ref, 'datadog-api-spec/generated/')
+    if: >
+      github.event.pull_request.draft == false &&
+      !contains(github.event.pull_request.labels.*.name, 'ci/skip') &&
+      !contains(github.event.pull_request.head.ref, 'datadog-api-spec/test/')
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-python@v1
+      - name: Get GitHub App token
+        id: get_token
+        uses: tibdex/[email protected]
+        with:
+          app_id: ${{ secrets.PIPELINE_GITHUB_APP_ID }}
+          private_key: ${{ secrets.PIPELINE_GITHUB_APP_PRIVATE_KEY }}
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
+          token: ${{ steps.get_token.outputs.token }}
       - name: Install pre-commit
         run: python -m pip install pre-commit
       - name: set PY
@@ -24,8 +40,20 @@ jobs:
         with:
           path: ~/.cache/pre-commit
           key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Run pre-commit
-        run: pre-commit run --from-ref ${{ github.event.pull_request.base.sha }} --to-ref ${{ github.event.pull_request.head.sha }} --show-diff-on-failure --color=always
+      - id: pre_commit
+        name: Run pre-commit
+        if: github.event.action != 'closed' && github.event.pull_request.merged != true
+        run: |
+          pre-commit run --from-ref ${{ github.event.pull_request.base.sha }} --to-ref ${{ github.event.pull_request.head.sha }} --show-diff-on-failure --color=always
+      - name: Commit changes
+        if: ${{ failure() }}
+        run: |-
+          git add -A
+          git config user.name "${GIT_AUTHOR_NAME}"
+          git config user.email "${GIT_AUTHOR_EMAIL}"
+          git commit -m "pre-commit fixes"
+          git push origin HEAD:${{ github.event.pull_request.head.ref }}
+          exit 1
 
   test:
     strategy:

.pre-commit-config.yaml

@@ -1,23 +1,11 @@
 repos:
 - repo: local
   hooks:
-  - id: generated
-    name: Do not commit generated files
-    language: fail
-    entry: Unstage generated files with 'git reset --' command
-    files: '^api/.*(?<!\_test.go)$'
-    verbose: true
-  - id: generated-features
-    name: Do not commit generated feature files
-    language: fail
-    entry: Unstage generated files with 'git reset --' command
-    files: "^tests/scenarios/features/v[1-9][0-9]*/.*.feature$"
-    verbose: true
   - id: generate
     name: Generate
     language: node
     entry: make
-    files: "^.generator/.*"
+    files: '^(\.generator/.*|\.pre-commit-config\.yaml|Makefile)'
     pass_filenames: false
   - id: lint
     name: Lint

api/v1/datadog/.openapi-generator/FILES

@@ -477,6 +477,12 @@ docs/SyntheticsAssertionOperator.md
 docs/SyntheticsAssertionTarget.md
 docs/SyntheticsAssertionType.md
 docs/SyntheticsBasicAuth.md
+docs/SyntheticsBasicAuthNTLM.md
+docs/SyntheticsBasicAuthNTLMType.md
+docs/SyntheticsBasicAuthSigv4.md
+docs/SyntheticsBasicAuthSigv4Type.md
+docs/SyntheticsBasicAuthWeb.md
+docs/SyntheticsBasicAuthWebType.md
 docs/SyntheticsBatchDetails.md
 docs/SyntheticsBatchDetailsData.md
 docs/SyntheticsBatchResult.md
@@ -551,6 +557,7 @@ docs/SyntheticsTestProcessStatus.md
 docs/SyntheticsTestRequest.md
 docs/SyntheticsTestRequestCertificate.md
 docs/SyntheticsTestRequestCertificateItem.md
+docs/SyntheticsTestRequestProxy.md
 docs/SyntheticsTiming.md
 docs/SyntheticsTriggerBody.md
 docs/SyntheticsTriggerCITestLocation.md
@@ -1144,6 +1151,12 @@ model_synthetics_assertion_operator.go
 model_synthetics_assertion_target.go
 model_synthetics_assertion_type.go
 model_synthetics_basic_auth.go
+model_synthetics_basic_auth_ntlm.go
+model_synthetics_basic_auth_ntlm_type.go
+model_synthetics_basic_auth_sigv4.go
+model_synthetics_basic_auth_sigv4_type.go
+model_synthetics_basic_auth_web.go
+model_synthetics_basic_auth_web_type.go
 model_synthetics_batch_details.go
 model_synthetics_batch_details_data.go
 model_synthetics_batch_result.go
@@ -1218,6 +1231,7 @@ model_synthetics_test_process_status.go
 model_synthetics_test_request.go
 model_synthetics_test_request_certificate.go
 model_synthetics_test_request_certificate_item.go
+model_synthetics_test_request_proxy.go
 model_synthetics_timing.go
 model_synthetics_trigger_body.go
 model_synthetics_trigger_ci_test_location.go

api/v1/datadog/README.md

@@ -710,6 +710,12 @@ All URIs are relative to *https://api.datadoghq.com*
 - [SyntheticsAssertionTarget](docs/SyntheticsAssertionTarget.md)
 - [SyntheticsAssertionType](docs/SyntheticsAssertionType.md)
 - [SyntheticsBasicAuth](docs/SyntheticsBasicAuth.md)
+- [SyntheticsBasicAuthNTLM](docs/SyntheticsBasicAuthNTLM.md)
+- [SyntheticsBasicAuthNTLMType](docs/SyntheticsBasicAuthNTLMType.md)
+- [SyntheticsBasicAuthSigv4](docs/SyntheticsBasicAuthSigv4.md)
+- [SyntheticsBasicAuthSigv4Type](docs/SyntheticsBasicAuthSigv4Type.md)
+- [SyntheticsBasicAuthWeb](docs/SyntheticsBasicAuthWeb.md)
+- [SyntheticsBasicAuthWebType](docs/SyntheticsBasicAuthWebType.md)
 - [SyntheticsBatchDetails](docs/SyntheticsBatchDetails.md)
 - [SyntheticsBatchDetailsData](docs/SyntheticsBatchDetailsData.md)
 - [SyntheticsBatchResult](docs/SyntheticsBatchResult.md)
@@ -784,6 +790,7 @@ All URIs are relative to *https://api.datadoghq.com*
 - [SyntheticsTestRequest](docs/SyntheticsTestRequest.md)
 - [SyntheticsTestRequestCertificate](docs/SyntheticsTestRequestCertificate.md)
 - [SyntheticsTestRequestCertificateItem](docs/SyntheticsTestRequestCertificateItem.md)
+- [SyntheticsTestRequestProxy](docs/SyntheticsTestRequestProxy.md)
 - [SyntheticsTiming](docs/SyntheticsTiming.md)
 - [SyntheticsTriggerBody](docs/SyntheticsTriggerBody.md)
 - [SyntheticsTriggerCITestLocation](docs/SyntheticsTriggerCITestLocation.md)