diff --git a/src/datadog-service-catalog.ts b/src/datadog-service-catalog.ts index 1226cd67..65c3b321 100644 --- a/src/datadog-service-catalog.ts +++ b/src/datadog-service-catalog.ts @@ -164,21 +164,21 @@ export module datadogServiceCatalog { const contacts = `${options.contacts?.map( (contact) => ` - - type: ${contact.type} - contact: ${contact.contact} - name: ${contact.name}`, +- type: ${contact.type} + contact: ${contact.contact} + name: ${contact.name}`, )}`; const links = `${options.links?.map( (link) => ` - - type: ${link.type} - url: ${link.url} - name: ${link.name}`, +- type: ${link.type} + url: ${link.url} + name: ${link.name}`, )}`; const tags = `${Object.keys(serviceTags).map( (key) => ` - - ${key}:${serviceTags[key]}`, +- ${key}:${serviceTags[key]}`, )}`; const step: JobStep = { @@ -195,7 +195,6 @@ export module datadogServiceCatalog { tier: `${serviceInfo.tier ?? DefaultServiceCatalogValues.TIER}`, lifecycle: `${serviceInfo.lifecycle ?? DefaultServiceCatalogValues.NOT_PROVIDED}`, team: `${serviceInfo.team ?? DefaultServiceCatalogValues.NOT_PROVIDED}`, - pagerdutyUrl: `${serviceInfo.pagerdutyUrl ?? DefaultServiceCatalogValues.NOT_PROVIDED}`, 'slack-support-channel': `${DefaultServiceCatalogValues.SLACK_SUPPORT_CHANNEL}`, contacts, links, diff --git a/test/__snapshots__/clickup-cdk.test.ts.snap b/test/__snapshots__/clickup-cdk.test.ts.snap index 49043ca1..616b5943 100644 --- a/test/__snapshots__/clickup-cdk.test.ts.snap +++ b/test/__snapshots__/clickup-cdk.test.ts.snap @@ -1404,16 +1404,15 @@ jobs: tier: critical lifecycle: unit-test team: testing - pagerdutyUrl: https://test.pagerduty.com slack-support-channel: https://click-up.slack.com/archives/C043T0JBJKY contacts: undefined links: undefined - tags: |2- + tags: |- - - project:test, - - release:true, - - version:\${{ steps.event_metadata.outputs.release_tag }}, - - actor:\${{ github.actor }} + - project:test, + - release:true, + - version:\${{ steps.event_metadata.outputs.release_tag }}, + - actor:\${{ github.actor }} " `; @@ -1586,20 +1585,19 @@ jobs: tier: critical lifecycle: unit-test team: testing - pagerdutyUrl: https://test.pagerduty.com slack-support-channel: https://click-up.slack.com/archives/C043T0JBJKY - contacts: |2- + contacts: |- - - type: email - contact: contacttest@clickup.com - name: contact test + - type: email + contact: contacttest@clickup.com + name: contact test links: undefined - tags: |2- + tags: |- - - project:test, - - release:true, - - version:\${{ steps.event_metadata.outputs.release_tag }}, - - actor:\${{ github.actor }} + - project:test, + - release:true, + - version:\${{ steps.event_metadata.outputs.release_tag }}, + - actor:\${{ github.actor }} " `; @@ -1772,24 +1770,23 @@ jobs: tier: critical lifecycle: unit-test team: testing - pagerdutyUrl: https://test.pagerduty.com slack-support-channel: https://click-up.slack.com/archives/C043T0JBJKY - contacts: |2- + contacts: |- - - type: email - contact: contacttest@clickup.com - name: contact test - links: |2- + - type: email + contact: contacttest@clickup.com + name: contact test + links: |- - - type: other - url: https://test.clickup.com - name: link test - tags: |2- + - type: other + url: https://test.clickup.com + name: link test + tags: |- - - project:test, - - release:true, - - version:\${{ steps.event_metadata.outputs.release_tag }}, - - actor:\${{ github.actor }} + - project:test, + - release:true, + - version:\${{ steps.event_metadata.outputs.release_tag }}, + - actor:\${{ github.actor }} " `; @@ -1962,16 +1959,15 @@ jobs: tier: low lifecycle: Not Provided team: testing - pagerdutyUrl: Not Provided slack-support-channel: https://click-up.slack.com/archives/C043T0JBJKY contacts: undefined links: undefined - tags: |2- + tags: |- - - project:test, - - release:true, - - version:\${{ steps.event_metadata.outputs.release_tag }}, - - actor:\${{ github.actor }} + - project:test, + - release:true, + - version:\${{ steps.event_metadata.outputs.release_tag }}, + - actor:\${{ github.actor }} " `; diff --git a/test/__snapshots__/datadog-service-catalog.test.ts.snap b/test/__snapshots__/datadog-service-catalog.test.ts.snap index 332598b3..2b51a21a 100644 --- a/test/__snapshots__/datadog-service-catalog.test.ts.snap +++ b/test/__snapshots__/datadog-service-catalog.test.ts.snap @@ -98,29 +98,28 @@ jobs: tier: critical lifecycle: Not Provided team: Not Provided - pagerdutyUrl: https://test.pagerduty.com slack-support-channel: https://click-up.slack.com/archives/C043T0JBJKY - contacts: |2- + contacts: |- - - type: email - contact: contacttest@clickup.com - name: contact test - links: |2- + - type: email + contact: contacttest@clickup.com + name: contact test + links: |- - - type: other - url: https://test.clickup.com - name: link test, - - type: other - url: https://staging.clickup.com - name: staging link test - tags: |2- + - type: other + url: https://test.clickup.com + name: link test, + - type: other + url: https://staging.clickup.com + name: staging link test + tags: |- - - project:test-cdk, - - release:true, - - version:\${{ steps.event_metadata.outputs.release_tag }}, - - actor:\${{ github.actor }}, - - tag1:tag1-test, - - tag2:tag2-test + - project:test-cdk, + - release:true, + - version:\${{ steps.event_metadata.outputs.release_tag }}, + - actor:\${{ github.actor }}, + - tag1:tag1-test, + - tag2:tag2-test " `; @@ -222,16 +221,15 @@ jobs: tier: critical lifecycle: unit-test team: testing - pagerdutyUrl: https://test.pagerduty.com slack-support-channel: https://click-up.slack.com/archives/C043T0JBJKY contacts: undefined links: undefined - tags: |2- + tags: |- - - project:test-cdk, - - release:true, - - version:\${{ steps.event_metadata.outputs.release_tag }}, - - actor:\${{ github.actor }} + - project:test-cdk, + - release:true, + - version:\${{ steps.event_metadata.outputs.release_tag }}, + - actor:\${{ github.actor }} - name: Publish DD Service Catalog for test-cdk uses: arcxp/datadog-service-catalog-metadata-provider@v2 with: @@ -245,15 +243,14 @@ jobs: tier: low lifecycle: Not Provided team: testing - pagerdutyUrl: Not Provided slack-support-channel: https://click-up.slack.com/archives/C043T0JBJKY contacts: undefined links: undefined - tags: |2- + tags: |- - - project:test-cdk, - - release:true, - - version:\${{ steps.event_metadata.outputs.release_tag }}, - - actor:\${{ github.actor }} + - project:test-cdk, + - release:true, + - version:\${{ steps.event_metadata.outputs.release_tag }}, + - actor:\${{ github.actor }} " `;