diff --git a/datadog/fwprovider/resource_datadog_software_catalog.go b/datadog/fwprovider/resource_datadog_software_catalog.go index e48ae667de..a06242780e 100644 --- a/datadog/fwprovider/resource_datadog_software_catalog.go +++ b/datadog/fwprovider/resource_datadog_software_catalog.go @@ -37,13 +37,14 @@ type EntityResponse struct { } type Included struct { - ID string + ID string `json:"id"` + Type string `json:"type"` Attributes *IncludedAttributes `json:"attributes"` } type IncludedAttributes struct { Schema *Entity `json:"schema,omitempty"` - RawSchema string `json:"raw_schema,omitempty"` + RawSchema string } func entityFromYAML(inYAML string) (Entity, error) { @@ -276,7 +277,7 @@ func (r *catalogEntityResource) Read(ctx context.Context, request resource.ReadR } if len(entityResp.Included) != 1 || entityResp.Included[0].Attributes == nil || entityResp.Included[0].Attributes.RawSchema == "" { - err := fmt.Errorf("no entity is found in the response, path=%v response=%v", path, httpRespByte) + err := fmt.Errorf("no entity is found in the response, path=%v response=%v", path, string(httpRespByte)) response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error retrieving entity")) return } @@ -284,7 +285,7 @@ func (r *catalogEntityResource) Read(ctx context.Context, request resource.ReadR var e Entity rawSchema := entityResp.Included[0].Attributes.RawSchema encodedBytes := decodeBase64String(rawSchema, response) - err = json.Unmarshal(encodedBytes, &e) + err = yaml.Unmarshal(encodedBytes, &e) if err != nil { response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error unmarshalling entity")) return diff --git a/datadog/tests/cassettes/TestAccDatadogSoftwareCatalogEntity_Basic.freeze b/datadog/tests/cassettes/TestAccDatadogSoftwareCatalogEntity_Basic.freeze index 5c4ebd84c8..d0a175563f 100644 --- a/datadog/tests/cassettes/TestAccDatadogSoftwareCatalogEntity_Basic.freeze +++ b/datadog/tests/cassettes/TestAccDatadogSoftwareCatalogEntity_Basic.freeze @@ -1 +1 @@ -2024-09-30T15:40:43.724114-04:00 \ No newline at end of file +2024-10-01T09:42:13.446934-04:00 \ No newline at end of file diff --git a/datadog/tests/cassettes/TestAccDatadogSoftwareCatalogEntity_Basic.yaml b/datadog/tests/cassettes/TestAccDatadogSoftwareCatalogEntity_Basic.yaml index 031fd0a226..69a129a5bd 100644 --- a/datadog/tests/cassettes/TestAccDatadogSoftwareCatalogEntity_Basic.yaml +++ b/datadog/tests/cassettes/TestAccDatadogSoftwareCatalogEntity_Basic.yaml @@ -16,7 +16,7 @@ interactions: apiVersion: v3 kind: service metadata: - name: tf-testaccdatadogsoftwarecatalogentity_basic-local-1727725243 + name: tf-testaccdatadogsoftwarecatalogentity_basic-local-1727790133 displayName: Shopping Cart tags: - tag:value @@ -110,13 +110,13 @@ interactions: trailer: {} content_length: -1 uncompressed: true - body: '{"data":[{"id":"5c96f836-63be-42c5-8972-39c3632bb23b","type":"entity","attributes":{"apiVersion":"v3","displayName":"Shopping Cart","kind":"service","name":"tf-testaccdatadogsoftwarecatalogentity_basic-local-1727725243","namespace":"default","owner":"myteam","tags":["tag:value"]},"relationships":{"schema":{"data":{"id":"5c96f836-63be-42c5-8972-39c3632bb23b","type":"schema"}}},"meta":{"createdAt":"2024-09-30T19:40:44.931197389Z","modifiedAt":"2024-09-30T19:40:44.931197192Z","ingestionSource":"api","origin":"unknown"}}],"meta":{"count":1,"includeCount":1},"included":[{"id":"5c96f836-63be-42c5-8972-39c3632bb23b","type":"schema","attributes":{"schema":{"apiVersion":"v3","kind":"service","metadata":{"name":"tf-testaccdatadogsoftwarecatalogentity_basic-local-1727725243","namespace":"default","displayName":"Shopping Cart","tags":["tag:value"],"owner":"myteam","links":[{"name":"shopping-cart runbook","type":"runbook","url":"https://runbook/shopping-cart"},{"name":"shopping-cart architecture","type":"doc","provider":"gdoc","url":"https://google.drive/shopping-cart-architecture"},{"name":"shopping-cart Wiki","type":"doc","provider":"wiki","url":"https://wiki/shopping-cart"},{"name":"shopping-cart source code","type":"repo","provider":"github","url":"http://github/shopping-cart"}],"contacts":[{"name":"Support Email","type":"email","contact":"team@shopping.com"},{"name":"Support Slack","type":"slack","contact":"https://www.slack.com/archives/shopping-cart"}],"additionalOwners":[{"name":"opsTeam","type":"operator"}],"managed":{"origin":{"origin":"unknown"},"ingestionSource":"api","createdAt":"2024-09-30T19:40:44.931197389Z","modifiedAt":"2024-09-30T19:40:44.931197192Z"}},"extensions":{"datadoghq.com/shopping-cart":{"customField":"customValue"}},"integrations":{"pagerduty":{"serviceURL":"https://www.pagerduty.com/service-directory/Pshopping-cart"},"opsgenie":{"serviceURL":"https://www.opsgenie.com/service/shopping-cart","region":"US"}},"datadog":{"performanceData":{"tags":["service:shopping-cart","hostname:shopping-cart"]},"events":[{"name":"deployment events","query":"app:myapp AND type:github"},{"name":"event type B","query":"app:myapp AND type:github"}],"logs":[{"name":"critical logs","query":"app:myapp AND type:github"},{"name":"ops logs","query":"app:myapp AND type:github"}],"pipelines":{"fingerprints":["fp1","fp2"]},"codeLocations":[{"repositoryURL":"http://github/shopping-cart.git","paths":["baz/*.c","bat/**/*","../plop/*.java"]},{"repositoryURL":"http://github/shopping-cart-2.git","paths":["baz/*.c","bat/**/*","../plop/*.java"]}]},"spec":{"lifecycle":"production","tier":"1","languages":["go","python"],"type":"web","dependsOn":["service:serviceA","service:serviceB"]}}}}]}' + body: '{"data":[{"id":"d151ac5c-bcde-47ce-964e-38ee621f32c5","type":"entity","attributes":{"apiVersion":"v3","displayName":"Shopping Cart","kind":"service","name":"tf-testaccdatadogsoftwarecatalogentity_basic-local-1727790133","namespace":"default","owner":"myteam","tags":["tag:value"]},"relationships":{"schema":{"data":{"id":"d151ac5c-bcde-47ce-964e-38ee621f32c5","type":"schema"}}},"meta":{"createdAt":"2024-10-01T13:42:14.508637517Z","modifiedAt":"2024-10-01T13:42:14.508637353Z","ingestionSource":"api","origin":"unknown"}}],"meta":{"count":1,"includeCount":1},"included":[{"id":"d151ac5c-bcde-47ce-964e-38ee621f32c5","type":"schema","attributes":{"schema":{"apiVersion":"v3","kind":"service","metadata":{"name":"tf-testaccdatadogsoftwarecatalogentity_basic-local-1727790133","namespace":"default","displayName":"Shopping Cart","tags":["tag:value"],"owner":"myteam","links":[{"name":"shopping-cart runbook","type":"runbook","url":"https://runbook/shopping-cart"},{"name":"shopping-cart architecture","type":"doc","provider":"gdoc","url":"https://google.drive/shopping-cart-architecture"},{"name":"shopping-cart Wiki","type":"doc","provider":"wiki","url":"https://wiki/shopping-cart"},{"name":"shopping-cart source code","type":"repo","provider":"github","url":"http://github/shopping-cart"}],"contacts":[{"name":"Support Email","type":"email","contact":"team@shopping.com"},{"name":"Support Slack","type":"slack","contact":"https://www.slack.com/archives/shopping-cart"}],"additionalOwners":[{"name":"opsTeam","type":"operator"}],"managed":{"origin":{"origin":"unknown"},"ingestionSource":"api","createdAt":"2024-10-01T13:42:14.508637517Z","modifiedAt":"2024-10-01T13:42:14.508637353Z"}},"extensions":{"datadoghq.com/shopping-cart":{"customField":"customValue"}},"integrations":{"pagerduty":{"serviceURL":"https://www.pagerduty.com/service-directory/Pshopping-cart"},"opsgenie":{"serviceURL":"https://www.opsgenie.com/service/shopping-cart","region":"US"}},"datadog":{"performanceData":{"tags":["service:shopping-cart","hostname:shopping-cart"]},"events":[{"name":"deployment events","query":"app:myapp AND type:github"},{"name":"event type B","query":"app:myapp AND type:github"}],"logs":[{"name":"critical logs","query":"app:myapp AND type:github"},{"name":"ops logs","query":"app:myapp AND type:github"}],"pipelines":{"fingerprints":["fp1","fp2"]},"codeLocations":[{"repositoryURL":"http://github/shopping-cart.git","paths":["baz/*.c","bat/**/*","../plop/*.java"]},{"repositoryURL":"http://github/shopping-cart-2.git","paths":["baz/*.c","bat/**/*","../plop/*.java"]}]},"spec":{"lifecycle":"production","tier":"1","languages":["go","python"],"type":"web","dependsOn":["service:serviceA","service:serviceB"]}}}}]}' headers: Content-Type: - application/vnd.api+json status: 202 Accepted code: 202 - duration: 184.217083ms + duration: 168.954833ms - id: 1 request: proto: HTTP/1.1 @@ -133,7 +133,7 @@ interactions: headers: Content-Type: - application/json - url: https://api.datadoghq.com/api/v2/catalog/entity?filter%5Bref%5D=service%3Adefault%2Ftf-testaccdatadogsoftwarecatalogentity_basic-local-1727725243&include=raw_schema + url: https://api.datadoghq.com/api/v2/catalog/entity?filter%5Bref%5D=service%3Adefault%2Ftf-testaccdatadogsoftwarecatalogentity_basic-local-1727790133&include=raw_schema method: GET response: proto: HTTP/1.1 @@ -143,13 +143,13 @@ interactions: trailer: {} content_length: -1 uncompressed: true - body: '{"data":[{"id":"5c96f836-63be-42c5-8972-39c3632bb23b","type":"entity","attributes":{"apiVersion":"v3","displayName":"Shopping Cart","kind":"service","name":"tf-testaccdatadogsoftwarecatalogentity_basic-local-1727725243","namespace":"default","owner":"myteam","tags":["tag:value"]},"relationships":{"rawSchema":{"data":{"id":"5c96f836-63be-42c5-8972-39c3632bb23b","type":"rawSchema"}}},"meta":{"createdAt":"2024-09-30T19:40:44.931197389Z","modifiedAt":"2024-09-30T19:40:44.931197192Z","ingestionSource":"api","origin":"unknown"}}],"meta":{"count":1,"includeCount":1},"links":{"self":"/api/v2/catalog/entity?filter%5Bref%5D=service%3Adefault%2Ftf-testaccdatadogsoftwarecatalogentity_basic-local-1727725243\u0026include=raw_schema\u0026page%5Blimit%5D=100\u0026page%5Boffset%5D=0"},"included":[{"id":"5c96f836-63be-42c5-8972-39c3632bb23b","type":"rawSchema","attributes":{"rawSchema":"LS0tCmFwaVZlcnNpb246IHYzCmtpbmQ6IHNlcnZpY2UKbWV0YWRhdGE6CiAgbmFtZTogdGYtdGVzdGFjY2RhdGFkb2dzb2Z0d2FyZWNhdGFsb2dlbnRpdHlfYmFzaWMtbG9jYWwtMTcyNzcyNTI0MwogIGRpc3BsYXlOYW1lOiBTaG9wcGluZyBDYXJ0CiAgdGFnczoKICAgIC0gdGFnOnZhbHVlCiAgbGlua3M6CiAgICAtIG5hbWU6IHNob3BwaW5nLWNhcnQgcnVuYm9vawogICAgICB0eXBlOiBydW5ib29rCiAgICAgIHVybDogaHR0cHM6Ly9ydW5ib29rL3Nob3BwaW5nLWNhcnQKICAgIC0gbmFtZTogc2hvcHBpbmctY2FydCBhcmNoaXRlY3R1cmUKICAgICAgcHJvdmlkZXI6IGdkb2MKICAgICAgdXJsOiBodHRwczovL2dvb2dsZS5kcml2ZS9zaG9wcGluZy1jYXJ0LWFyY2hpdGVjdHVyZQogICAgICB0eXBlOiBkb2MKICAgIC0gbmFtZTogc2hvcHBpbmctY2FydCBXaWtpCiAgICAgIHByb3ZpZGVyOiB3aWtpCiAgICAgIHVybDogaHR0cHM6Ly93aWtpL3Nob3BwaW5nLWNhcnQKICAgICAgdHlwZTogZG9jCiAgICAtIG5hbWU6IHNob3BwaW5nLWNhcnQgc291cmNlIGNvZGUKICAgICAgcHJvdmlkZXI6IGdpdGh1YgogICAgICB1cmw6IGh0dHA6Ly9naXRodWIvc2hvcHBpbmctY2FydAogICAgICB0eXBlOiByZXBvCiAgY29udGFjdHM6CiAgICAtIG5hbWU6IFN1cHBvcnQgRW1haWwKICAgICAgdHlwZTogZW1haWwKICAgICAgY29udGFjdDogdGVhbUBzaG9wcGluZy5jb20KICAgIC0gbmFtZTogU3VwcG9ydCBTbGFjawogICAgICB0eXBlOiBzbGFjawogICAgICBjb250YWN0OiBodHRwczovL3d3dy5zbGFjay5jb20vYXJjaGl2ZXMvc2hvcHBpbmctY2FydAogIG93bmVyOiBteXRlYW0KICBhZGRpdGlvbmFsT3duZXJzOgogICAgLSBuYW1lOiBvcHNUZWFtCiAgICAgIHR5cGU6IG9wZXJhdG9yCmludGVncmF0aW9uczoKICBwYWdlcmR1dHk6CiAgICBzZXJ2aWNlVVJMOiBodHRwczovL3d3dy5wYWdlcmR1dHkuY29tL3NlcnZpY2UtZGlyZWN0b3J5L1BzaG9wcGluZy1jYXJ0CiAgb3BzZ2VuaWU6CiAgICBzZXJ2aWNlVVJMOiBodHRwczovL3d3dy5vcHNnZW5pZS5jb20vc2VydmljZS9zaG9wcGluZy1jYXJ0CiAgICByZWdpb246IFVTCmV4dGVuc2lvbnM6CiAgZGF0YWRvZ2hxLmNvbS9zaG9wcGluZy1jYXJ0OgogICAgY3VzdG9tRmllbGQ6IGN1c3RvbVZhbHVlCnNwZWM6CiAgbGlmZWN5Y2xlOiBwcm9kdWN0aW9uCiAgdGllcjogIjEiCiAgdHlwZTogd2ViCiAgbGFuZ3VhZ2VzOgogICAgLSBnbwogICAgLSBweXRob24KICBkZXBlbmRzT246CiAgICAtIHNlcnZpY2U6c2VydmljZUEKICAgIC0gc2VydmljZTpzZXJ2aWNlQgpkYXRhZG9nOgogIHBlcmZvcm1hbmNlRGF0YToKICAgIHRhZ3M6CiAgICAgIC0gJ3NlcnZpY2U6c2hvcHBpbmctY2FydCcKICAgICAgLSAnaG9zdG5hbWU6c2hvcHBpbmctY2FydCcKICBldmVudHM6CiAgICAtIG5hbWU6ICJkZXBsb3ltZW50IGV2ZW50cyIKICAgICAgcXVlcnk6ICJhcHA6bXlhcHAgQU5EIHR5cGU6Z2l0aHViIgogICAgLSBuYW1lOiAiZXZlbnQgdHlwZSBCIgogICAgICBxdWVyeTogImFwcDpteWFwcCBBTkQgdHlwZTpnaXRodWIiCiAgbG9nczoKICAgIC0gbmFtZTogImNyaXRpY2FsIGxvZ3MiCiAgICAgIHF1ZXJ5OiAiYXBwOm15YXBwIEFORCB0eXBlOmdpdGh1YiIKICAgIC0gbmFtZTogIm9wcyBsb2dzIgogICAgICBxdWVyeTogImFwcDpteWFwcCBBTkQgdHlwZTpnaXRodWIiCiAgcGlwZWxpbmVzOgogICAgZmluZ2VycHJpbnRzOgogICAgICAtIGZwMQogICAgICAtIGZwMgogIGNvZGVMb2NhdGlvbnM6CiAgICAtIHJlcG9zaXRvcnlVUkw6IGh0dHA6Ly9naXRodWIvc2hvcHBpbmctY2FydC5naXQKICAgICAgcGF0aHM6CiAgICAgICAgLSBiYXovKi5jCiAgICAgICAgLSBiYXQvKiovKgogICAgICAgIC0gLi4vcGxvcC8qLmphdmEKICAgIC0gcmVwb3NpdG9yeVVSTDogaHR0cDovL2dpdGh1Yi9zaG9wcGluZy1jYXJ0LTIuZ2l0CiAgICAgIHBhdGhzOgogICAgICAgIC0gYmF6LyouYwogICAgICAgIC0gYmF0LyoqLyoKICAgICAgICAtIC4uL3Bsb3AvKi5qYXZhCg=="}}]}' + body: '{"data":[{"id":"d151ac5c-bcde-47ce-964e-38ee621f32c5","type":"entity","attributes":{"apiVersion":"v3","displayName":"Shopping Cart","kind":"service","name":"tf-testaccdatadogsoftwarecatalogentity_basic-local-1727790133","namespace":"default","owner":"myteam","tags":["tag:value"]},"relationships":{"rawSchema":{"data":{"id":"d151ac5c-bcde-47ce-964e-38ee621f32c5","type":"rawSchema"}}},"meta":{"createdAt":"2024-10-01T13:42:14.508637517Z","modifiedAt":"2024-10-01T13:42:14.508637353Z","ingestionSource":"api","origin":"unknown"}}],"meta":{"count":1,"includeCount":1},"links":{"self":"/api/v2/catalog/entity?filter%5Bref%5D=service%3Adefault%2Ftf-testaccdatadogsoftwarecatalogentity_basic-local-1727790133\u0026include=raw_schema\u0026page%5Blimit%5D=100\u0026page%5Boffset%5D=0"},"included":[{"id":"d151ac5c-bcde-47ce-964e-38ee621f32c5","type":"rawSchema","attributes":{"rawSchema":"LS0tCmFwaVZlcnNpb246IHYzCmtpbmQ6IHNlcnZpY2UKbWV0YWRhdGE6CiAgbmFtZTogdGYtdGVzdGFjY2RhdGFkb2dzb2Z0d2FyZWNhdGFsb2dlbnRpdHlfYmFzaWMtbG9jYWwtMTcyNzc5MDEzMwogIGRpc3BsYXlOYW1lOiBTaG9wcGluZyBDYXJ0CiAgdGFnczoKICAgIC0gdGFnOnZhbHVlCiAgbGlua3M6CiAgICAtIG5hbWU6IHNob3BwaW5nLWNhcnQgcnVuYm9vawogICAgICB0eXBlOiBydW5ib29rCiAgICAgIHVybDogaHR0cHM6Ly9ydW5ib29rL3Nob3BwaW5nLWNhcnQKICAgIC0gbmFtZTogc2hvcHBpbmctY2FydCBhcmNoaXRlY3R1cmUKICAgICAgcHJvdmlkZXI6IGdkb2MKICAgICAgdXJsOiBodHRwczovL2dvb2dsZS5kcml2ZS9zaG9wcGluZy1jYXJ0LWFyY2hpdGVjdHVyZQogICAgICB0eXBlOiBkb2MKICAgIC0gbmFtZTogc2hvcHBpbmctY2FydCBXaWtpCiAgICAgIHByb3ZpZGVyOiB3aWtpCiAgICAgIHVybDogaHR0cHM6Ly93aWtpL3Nob3BwaW5nLWNhcnQKICAgICAgdHlwZTogZG9jCiAgICAtIG5hbWU6IHNob3BwaW5nLWNhcnQgc291cmNlIGNvZGUKICAgICAgcHJvdmlkZXI6IGdpdGh1YgogICAgICB1cmw6IGh0dHA6Ly9naXRodWIvc2hvcHBpbmctY2FydAogICAgICB0eXBlOiByZXBvCiAgY29udGFjdHM6CiAgICAtIG5hbWU6IFN1cHBvcnQgRW1haWwKICAgICAgdHlwZTogZW1haWwKICAgICAgY29udGFjdDogdGVhbUBzaG9wcGluZy5jb20KICAgIC0gbmFtZTogU3VwcG9ydCBTbGFjawogICAgICB0eXBlOiBzbGFjawogICAgICBjb250YWN0OiBodHRwczovL3d3dy5zbGFjay5jb20vYXJjaGl2ZXMvc2hvcHBpbmctY2FydAogIG93bmVyOiBteXRlYW0KICBhZGRpdGlvbmFsT3duZXJzOgogICAgLSBuYW1lOiBvcHNUZWFtCiAgICAgIHR5cGU6IG9wZXJhdG9yCmludGVncmF0aW9uczoKICBwYWdlcmR1dHk6CiAgICBzZXJ2aWNlVVJMOiBodHRwczovL3d3dy5wYWdlcmR1dHkuY29tL3NlcnZpY2UtZGlyZWN0b3J5L1BzaG9wcGluZy1jYXJ0CiAgb3BzZ2VuaWU6CiAgICBzZXJ2aWNlVVJMOiBodHRwczovL3d3dy5vcHNnZW5pZS5jb20vc2VydmljZS9zaG9wcGluZy1jYXJ0CiAgICByZWdpb246IFVTCmV4dGVuc2lvbnM6CiAgZGF0YWRvZ2hxLmNvbS9zaG9wcGluZy1jYXJ0OgogICAgY3VzdG9tRmllbGQ6IGN1c3RvbVZhbHVlCnNwZWM6CiAgbGlmZWN5Y2xlOiBwcm9kdWN0aW9uCiAgdGllcjogIjEiCiAgdHlwZTogd2ViCiAgbGFuZ3VhZ2VzOgogICAgLSBnbwogICAgLSBweXRob24KICBkZXBlbmRzT246CiAgICAtIHNlcnZpY2U6c2VydmljZUEKICAgIC0gc2VydmljZTpzZXJ2aWNlQgpkYXRhZG9nOgogIHBlcmZvcm1hbmNlRGF0YToKICAgIHRhZ3M6CiAgICAgIC0gJ3NlcnZpY2U6c2hvcHBpbmctY2FydCcKICAgICAgLSAnaG9zdG5hbWU6c2hvcHBpbmctY2FydCcKICBldmVudHM6CiAgICAtIG5hbWU6ICJkZXBsb3ltZW50IGV2ZW50cyIKICAgICAgcXVlcnk6ICJhcHA6bXlhcHAgQU5EIHR5cGU6Z2l0aHViIgogICAgLSBuYW1lOiAiZXZlbnQgdHlwZSBCIgogICAgICBxdWVyeTogImFwcDpteWFwcCBBTkQgdHlwZTpnaXRodWIiCiAgbG9nczoKICAgIC0gbmFtZTogImNyaXRpY2FsIGxvZ3MiCiAgICAgIHF1ZXJ5OiAiYXBwOm15YXBwIEFORCB0eXBlOmdpdGh1YiIKICAgIC0gbmFtZTogIm9wcyBsb2dzIgogICAgICBxdWVyeTogImFwcDpteWFwcCBBTkQgdHlwZTpnaXRodWIiCiAgcGlwZWxpbmVzOgogICAgZmluZ2VycHJpbnRzOgogICAgICAtIGZwMQogICAgICAtIGZwMgogIGNvZGVMb2NhdGlvbnM6CiAgICAtIHJlcG9zaXRvcnlVUkw6IGh0dHA6Ly9naXRodWIvc2hvcHBpbmctY2FydC5naXQKICAgICAgcGF0aHM6CiAgICAgICAgLSBiYXovKi5jCiAgICAgICAgLSBiYXQvKiovKgogICAgICAgIC0gLi4vcGxvcC8qLmphdmEKICAgIC0gcmVwb3NpdG9yeVVSTDogaHR0cDovL2dpdGh1Yi9zaG9wcGluZy1jYXJ0LTIuZ2l0CiAgICAgIHBhdGhzOgogICAgICAgIC0gYmF6LyouYwogICAgICAgIC0gYmF0LyoqLyoKICAgICAgICAtIC4uL3Bsb3AvKi5qYXZhCg=="}}]}' headers: Content-Type: - application/vnd.api+json status: 200 OK code: 200 - duration: 63.684583ms + duration: 59.836042ms - id: 2 request: proto: HTTP/1.1 @@ -166,7 +166,7 @@ interactions: headers: Content-Type: - application/json - url: https://api.datadoghq.com/api/v2/catalog/entity?filter%5Bref%5D=service%3Adefault%2Ftf-testaccdatadogsoftwarecatalogentity_basic-local-1727725243&include=raw_schema + url: https://api.datadoghq.com/api/v2/catalog/entity?filter%5Bref%5D=service%3Adefault%2Ftf-testaccdatadogsoftwarecatalogentity_basic-local-1727790133&include=raw_schema method: GET response: proto: HTTP/1.1 @@ -176,13 +176,13 @@ interactions: trailer: {} content_length: -1 uncompressed: true - body: '{"data":[{"id":"5c96f836-63be-42c5-8972-39c3632bb23b","type":"entity","attributes":{"apiVersion":"v3","displayName":"Shopping Cart","kind":"service","name":"tf-testaccdatadogsoftwarecatalogentity_basic-local-1727725243","namespace":"default","owner":"myteam","tags":["tag:value"]},"relationships":{"rawSchema":{"data":{"id":"5c96f836-63be-42c5-8972-39c3632bb23b","type":"rawSchema"}}},"meta":{"createdAt":"2024-09-30T19:40:44.931197389Z","modifiedAt":"2024-09-30T19:40:44.931197192Z","ingestionSource":"api","origin":"unknown"}}],"meta":{"count":1,"includeCount":1},"links":{"self":"/api/v2/catalog/entity?filter%5Bref%5D=service%3Adefault%2Ftf-testaccdatadogsoftwarecatalogentity_basic-local-1727725243\u0026include=raw_schema\u0026page%5Blimit%5D=100\u0026page%5Boffset%5D=0"},"included":[{"id":"5c96f836-63be-42c5-8972-39c3632bb23b","type":"rawSchema","attributes":{"rawSchema":"LS0tCmFwaVZlcnNpb246IHYzCmtpbmQ6IHNlcnZpY2UKbWV0YWRhdGE6CiAgbmFtZTogdGYtdGVzdGFjY2RhdGFkb2dzb2Z0d2FyZWNhdGFsb2dlbnRpdHlfYmFzaWMtbG9jYWwtMTcyNzcyNTI0MwogIGRpc3BsYXlOYW1lOiBTaG9wcGluZyBDYXJ0CiAgdGFnczoKICAgIC0gdGFnOnZhbHVlCiAgbGlua3M6CiAgICAtIG5hbWU6IHNob3BwaW5nLWNhcnQgcnVuYm9vawogICAgICB0eXBlOiBydW5ib29rCiAgICAgIHVybDogaHR0cHM6Ly9ydW5ib29rL3Nob3BwaW5nLWNhcnQKICAgIC0gbmFtZTogc2hvcHBpbmctY2FydCBhcmNoaXRlY3R1cmUKICAgICAgcHJvdmlkZXI6IGdkb2MKICAgICAgdXJsOiBodHRwczovL2dvb2dsZS5kcml2ZS9zaG9wcGluZy1jYXJ0LWFyY2hpdGVjdHVyZQogICAgICB0eXBlOiBkb2MKICAgIC0gbmFtZTogc2hvcHBpbmctY2FydCBXaWtpCiAgICAgIHByb3ZpZGVyOiB3aWtpCiAgICAgIHVybDogaHR0cHM6Ly93aWtpL3Nob3BwaW5nLWNhcnQKICAgICAgdHlwZTogZG9jCiAgICAtIG5hbWU6IHNob3BwaW5nLWNhcnQgc291cmNlIGNvZGUKICAgICAgcHJvdmlkZXI6IGdpdGh1YgogICAgICB1cmw6IGh0dHA6Ly9naXRodWIvc2hvcHBpbmctY2FydAogICAgICB0eXBlOiByZXBvCiAgY29udGFjdHM6CiAgICAtIG5hbWU6IFN1cHBvcnQgRW1haWwKICAgICAgdHlwZTogZW1haWwKICAgICAgY29udGFjdDogdGVhbUBzaG9wcGluZy5jb20KICAgIC0gbmFtZTogU3VwcG9ydCBTbGFjawogICAgICB0eXBlOiBzbGFjawogICAgICBjb250YWN0OiBodHRwczovL3d3dy5zbGFjay5jb20vYXJjaGl2ZXMvc2hvcHBpbmctY2FydAogIG93bmVyOiBteXRlYW0KICBhZGRpdGlvbmFsT3duZXJzOgogICAgLSBuYW1lOiBvcHNUZWFtCiAgICAgIHR5cGU6IG9wZXJhdG9yCmludGVncmF0aW9uczoKICBwYWdlcmR1dHk6CiAgICBzZXJ2aWNlVVJMOiBodHRwczovL3d3dy5wYWdlcmR1dHkuY29tL3NlcnZpY2UtZGlyZWN0b3J5L1BzaG9wcGluZy1jYXJ0CiAgb3BzZ2VuaWU6CiAgICBzZXJ2aWNlVVJMOiBodHRwczovL3d3dy5vcHNnZW5pZS5jb20vc2VydmljZS9zaG9wcGluZy1jYXJ0CiAgICByZWdpb246IFVTCmV4dGVuc2lvbnM6CiAgZGF0YWRvZ2hxLmNvbS9zaG9wcGluZy1jYXJ0OgogICAgY3VzdG9tRmllbGQ6IGN1c3RvbVZhbHVlCnNwZWM6CiAgbGlmZWN5Y2xlOiBwcm9kdWN0aW9uCiAgdGllcjogIjEiCiAgdHlwZTogd2ViCiAgbGFuZ3VhZ2VzOgogICAgLSBnbwogICAgLSBweXRob24KICBkZXBlbmRzT246CiAgICAtIHNlcnZpY2U6c2VydmljZUEKICAgIC0gc2VydmljZTpzZXJ2aWNlQgpkYXRhZG9nOgogIHBlcmZvcm1hbmNlRGF0YToKICAgIHRhZ3M6CiAgICAgIC0gJ3NlcnZpY2U6c2hvcHBpbmctY2FydCcKICAgICAgLSAnaG9zdG5hbWU6c2hvcHBpbmctY2FydCcKICBldmVudHM6CiAgICAtIG5hbWU6ICJkZXBsb3ltZW50IGV2ZW50cyIKICAgICAgcXVlcnk6ICJhcHA6bXlhcHAgQU5EIHR5cGU6Z2l0aHViIgogICAgLSBuYW1lOiAiZXZlbnQgdHlwZSBCIgogICAgICBxdWVyeTogImFwcDpteWFwcCBBTkQgdHlwZTpnaXRodWIiCiAgbG9nczoKICAgIC0gbmFtZTogImNyaXRpY2FsIGxvZ3MiCiAgICAgIHF1ZXJ5OiAiYXBwOm15YXBwIEFORCB0eXBlOmdpdGh1YiIKICAgIC0gbmFtZTogIm9wcyBsb2dzIgogICAgICBxdWVyeTogImFwcDpteWFwcCBBTkQgdHlwZTpnaXRodWIiCiAgcGlwZWxpbmVzOgogICAgZmluZ2VycHJpbnRzOgogICAgICAtIGZwMQogICAgICAtIGZwMgogIGNvZGVMb2NhdGlvbnM6CiAgICAtIHJlcG9zaXRvcnlVUkw6IGh0dHA6Ly9naXRodWIvc2hvcHBpbmctY2FydC5naXQKICAgICAgcGF0aHM6CiAgICAgICAgLSBiYXovKi5jCiAgICAgICAgLSBiYXQvKiovKgogICAgICAgIC0gLi4vcGxvcC8qLmphdmEKICAgIC0gcmVwb3NpdG9yeVVSTDogaHR0cDovL2dpdGh1Yi9zaG9wcGluZy1jYXJ0LTIuZ2l0CiAgICAgIHBhdGhzOgogICAgICAgIC0gYmF6LyouYwogICAgICAgIC0gYmF0LyoqLyoKICAgICAgICAtIC4uL3Bsb3AvKi5qYXZhCg=="}}]}' + body: '{"data":[{"id":"d151ac5c-bcde-47ce-964e-38ee621f32c5","type":"entity","attributes":{"apiVersion":"v3","displayName":"Shopping Cart","kind":"service","name":"tf-testaccdatadogsoftwarecatalogentity_basic-local-1727790133","namespace":"default","owner":"myteam","tags":["tag:value"]},"relationships":{"rawSchema":{"data":{"id":"d151ac5c-bcde-47ce-964e-38ee621f32c5","type":"rawSchema"}}},"meta":{"createdAt":"2024-10-01T13:42:14.508637517Z","modifiedAt":"2024-10-01T13:42:14.508637353Z","ingestionSource":"api","origin":"unknown"}}],"meta":{"count":1,"includeCount":1},"links":{"self":"/api/v2/catalog/entity?filter%5Bref%5D=service%3Adefault%2Ftf-testaccdatadogsoftwarecatalogentity_basic-local-1727790133\u0026include=raw_schema\u0026page%5Blimit%5D=100\u0026page%5Boffset%5D=0"},"included":[{"id":"d151ac5c-bcde-47ce-964e-38ee621f32c5","type":"rawSchema","attributes":{"rawSchema":"LS0tCmFwaVZlcnNpb246IHYzCmtpbmQ6IHNlcnZpY2UKbWV0YWRhdGE6CiAgbmFtZTogdGYtdGVzdGFjY2RhdGFkb2dzb2Z0d2FyZWNhdGFsb2dlbnRpdHlfYmFzaWMtbG9jYWwtMTcyNzc5MDEzMwogIGRpc3BsYXlOYW1lOiBTaG9wcGluZyBDYXJ0CiAgdGFnczoKICAgIC0gdGFnOnZhbHVlCiAgbGlua3M6CiAgICAtIG5hbWU6IHNob3BwaW5nLWNhcnQgcnVuYm9vawogICAgICB0eXBlOiBydW5ib29rCiAgICAgIHVybDogaHR0cHM6Ly9ydW5ib29rL3Nob3BwaW5nLWNhcnQKICAgIC0gbmFtZTogc2hvcHBpbmctY2FydCBhcmNoaXRlY3R1cmUKICAgICAgcHJvdmlkZXI6IGdkb2MKICAgICAgdXJsOiBodHRwczovL2dvb2dsZS5kcml2ZS9zaG9wcGluZy1jYXJ0LWFyY2hpdGVjdHVyZQogICAgICB0eXBlOiBkb2MKICAgIC0gbmFtZTogc2hvcHBpbmctY2FydCBXaWtpCiAgICAgIHByb3ZpZGVyOiB3aWtpCiAgICAgIHVybDogaHR0cHM6Ly93aWtpL3Nob3BwaW5nLWNhcnQKICAgICAgdHlwZTogZG9jCiAgICAtIG5hbWU6IHNob3BwaW5nLWNhcnQgc291cmNlIGNvZGUKICAgICAgcHJvdmlkZXI6IGdpdGh1YgogICAgICB1cmw6IGh0dHA6Ly9naXRodWIvc2hvcHBpbmctY2FydAogICAgICB0eXBlOiByZXBvCiAgY29udGFjdHM6CiAgICAtIG5hbWU6IFN1cHBvcnQgRW1haWwKICAgICAgdHlwZTogZW1haWwKICAgICAgY29udGFjdDogdGVhbUBzaG9wcGluZy5jb20KICAgIC0gbmFtZTogU3VwcG9ydCBTbGFjawogICAgICB0eXBlOiBzbGFjawogICAgICBjb250YWN0OiBodHRwczovL3d3dy5zbGFjay5jb20vYXJjaGl2ZXMvc2hvcHBpbmctY2FydAogIG93bmVyOiBteXRlYW0KICBhZGRpdGlvbmFsT3duZXJzOgogICAgLSBuYW1lOiBvcHNUZWFtCiAgICAgIHR5cGU6IG9wZXJhdG9yCmludGVncmF0aW9uczoKICBwYWdlcmR1dHk6CiAgICBzZXJ2aWNlVVJMOiBodHRwczovL3d3dy5wYWdlcmR1dHkuY29tL3NlcnZpY2UtZGlyZWN0b3J5L1BzaG9wcGluZy1jYXJ0CiAgb3BzZ2VuaWU6CiAgICBzZXJ2aWNlVVJMOiBodHRwczovL3d3dy5vcHNnZW5pZS5jb20vc2VydmljZS9zaG9wcGluZy1jYXJ0CiAgICByZWdpb246IFVTCmV4dGVuc2lvbnM6CiAgZGF0YWRvZ2hxLmNvbS9zaG9wcGluZy1jYXJ0OgogICAgY3VzdG9tRmllbGQ6IGN1c3RvbVZhbHVlCnNwZWM6CiAgbGlmZWN5Y2xlOiBwcm9kdWN0aW9uCiAgdGllcjogIjEiCiAgdHlwZTogd2ViCiAgbGFuZ3VhZ2VzOgogICAgLSBnbwogICAgLSBweXRob24KICBkZXBlbmRzT246CiAgICAtIHNlcnZpY2U6c2VydmljZUEKICAgIC0gc2VydmljZTpzZXJ2aWNlQgpkYXRhZG9nOgogIHBlcmZvcm1hbmNlRGF0YToKICAgIHRhZ3M6CiAgICAgIC0gJ3NlcnZpY2U6c2hvcHBpbmctY2FydCcKICAgICAgLSAnaG9zdG5hbWU6c2hvcHBpbmctY2FydCcKICBldmVudHM6CiAgICAtIG5hbWU6ICJkZXBsb3ltZW50IGV2ZW50cyIKICAgICAgcXVlcnk6ICJhcHA6bXlhcHAgQU5EIHR5cGU6Z2l0aHViIgogICAgLSBuYW1lOiAiZXZlbnQgdHlwZSBCIgogICAgICBxdWVyeTogImFwcDpteWFwcCBBTkQgdHlwZTpnaXRodWIiCiAgbG9nczoKICAgIC0gbmFtZTogImNyaXRpY2FsIGxvZ3MiCiAgICAgIHF1ZXJ5OiAiYXBwOm15YXBwIEFORCB0eXBlOmdpdGh1YiIKICAgIC0gbmFtZTogIm9wcyBsb2dzIgogICAgICBxdWVyeTogImFwcDpteWFwcCBBTkQgdHlwZTpnaXRodWIiCiAgcGlwZWxpbmVzOgogICAgZmluZ2VycHJpbnRzOgogICAgICAtIGZwMQogICAgICAtIGZwMgogIGNvZGVMb2NhdGlvbnM6CiAgICAtIHJlcG9zaXRvcnlVUkw6IGh0dHA6Ly9naXRodWIvc2hvcHBpbmctY2FydC5naXQKICAgICAgcGF0aHM6CiAgICAgICAgLSBiYXovKi5jCiAgICAgICAgLSBiYXQvKiovKgogICAgICAgIC0gLi4vcGxvcC8qLmphdmEKICAgIC0gcmVwb3NpdG9yeVVSTDogaHR0cDovL2dpdGh1Yi9zaG9wcGluZy1jYXJ0LTIuZ2l0CiAgICAgIHBhdGhzOgogICAgICAgIC0gYmF6LyouYwogICAgICAgIC0gYmF0LyoqLyoKICAgICAgICAtIC4uL3Bsb3AvKi5qYXZhCg=="}}]}' headers: Content-Type: - application/vnd.api+json status: 200 OK code: 200 - duration: 49.334708ms + duration: 50.025541ms - id: 3 request: proto: HTTP/1.1 @@ -199,7 +199,7 @@ interactions: headers: Content-Type: - application/json - url: https://api.datadoghq.com/api/v2/catalog/entity/service:default/tf-testaccdatadogsoftwarecatalogentity_basic-local-1727725243 + url: https://api.datadoghq.com/api/v2/catalog/entity/service:default/tf-testaccdatadogsoftwarecatalogentity_basic-local-1727790133 method: DELETE response: proto: HTTP/1.1 @@ -213,7 +213,7 @@ interactions: headers: {} status: 204 No Content code: 204 - duration: 368.96525ms + duration: 82.44275ms - id: 4 request: proto: HTTP/1.1 @@ -230,7 +230,7 @@ interactions: headers: Content-Type: - application/json - url: https://api.datadoghq.com/api/v2/catalog/entity?filter%5Bref%5D=service%3Adefault%2Ftf-testaccdatadogsoftwarecatalogentity_basic-local-1727725243 + url: https://api.datadoghq.com/api/v2/catalog/entity?filter%5Bref%5D=service%3Adefault%2Ftf-testaccdatadogsoftwarecatalogentity_basic-local-1727790133 method: GET response: proto: HTTP/1.1 @@ -240,10 +240,10 @@ interactions: trailer: {} content_length: 236 uncompressed: false - body: '{"data":[],"meta":{"count":0,"includeCount":0},"links":{"self":"/api/v2/catalog/entity?filter%5Bref%5D=service%3Adefault%2Ftf-testaccdatadogsoftwarecatalogentity_basic-local-1727725243\u0026page%5Blimit%5D=100\u0026page%5Boffset%5D=0"}}' + body: '{"data":[],"meta":{"count":0,"includeCount":0},"links":{"self":"/api/v2/catalog/entity?filter%5Bref%5D=service%3Adefault%2Ftf-testaccdatadogsoftwarecatalogentity_basic-local-1727790133\u0026page%5Blimit%5D=100\u0026page%5Boffset%5D=0"}}' headers: Content-Type: - application/vnd.api+json status: 200 OK code: 200 - duration: 62.806042ms + duration: 57.225042ms