fix(deps): Update module github.com/DataDog/datadog-api-client-go/v2 …

…to v2.6.1 (#6185) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/DataDog/datadog-api-client-go/v2](https://togithub.com/DataDog/datadog-api-client-go) | require | minor | `v2.5.0` -> `v2.6.1` | --- ### Release Notes <details> <summary>DataDog/datadog-api-client-go</summary> ### [`v2.6.1`](https://togithub.com/DataDog/datadog-api-client-go/releases/tag/v2.6.1) [Compare Source](https://togithub.com/DataDog/datadog-api-client-go/compare/v2.6.0...v2.6.1)  #### What's Changed ##### Fixed - Remove incorrect required fields from CloudConfigurationComplianceRuleOptions by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1801 **Full Changelog**: DataDog/datadog-api-client-go@v2.6.0...v2.6.1 ### [`v2.6.0`](https://togithub.com/DataDog/datadog-api-client-go/releases/tag/v2.6.0) [Compare Source](https://togithub.com/DataDog/datadog-api-client-go/compare/v2.5.0...v2.6.0)  #### What's Changed ##### Fixed - Fix service catalog schema change by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1749 - Add missing response fields to MTD usage attribution endpoint by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1776 - Fix missing field in Synthetics tests authentication configuration by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1782 - Mark `hosts` response version fields as nullable by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1778 ##### Added - Add fields for CSPM GCP usage by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1756 - Introduce `PaginationResult` type to return errors in WithPagination methods by [@skarimo](https://togithub.com/skarimo) in [DataDog/datadog-api-client-go#1755 - Add offset and limit parameter to SLO correction API by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1759 - Add documentation for Logs Pipelines ReferenceTableLogsLookupProcessor by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1758 - Adding new field for the usage metering infra hosts by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1761 - Add `include_percentiles` field in Logs Custom Metrics by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1740 - Add OAuth support for Synthetics tests by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1764 - Add new billable summary fields by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1774 - RUM Applications Management API add client_token by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1765 - Support GRPC unary calls in Synthetics by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1772 - Add style object to dashboard widget formulas by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1787 - Add enable_samples monitor option by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1789 - Update security_monitoring endpoints for cloud_configuration rules by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1790 - Add support for sensitive data scanner APIs by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1784 - Add synthetics_parallel_testing to Usage Metering API by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1792 - Synthetics add pagination params to get all tests endpoint by [@api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [DataDog/datadog-api-client-go#1793 **Full Changelog**: DataDog/datadog-api-client-go@v2.5.0...v2.6.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - "before 3am on the first day of the month" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate).
cloudquery · Jan 1, 2023 · 3189307 · 3189307
1 parent 56041bf
commit 3189307
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 32 deletions.
diff --git a/plugins/source/datadog/Makefile b/plugins/source/datadog/Makefile
@@ -1,19 +1,14 @@
 # Generate mocks for mock/unit testing
 .PHONY: generate-mocks
 generate-mocks:
+	go install github.com/golang/mock/mockgen@v1.7.0-rc.1
 	go generate ./client/services/...
 
 # Test unit
 .PHONY: test
 test:
 	go test -timeout 3m ./...
 
-# Install tools
-.PHONY: install-tools
-install-tools:
-	@echo Installing tools from tools/tool.go
-	@cat tools/tool.go | grep _ | awk -F'"' '{print $$2}' | xargs -tI % go install %
-
 .PHONY: gen-docs
 gen-docs:
 	rm -rf ./docs/tables/*
@@ -30,4 +25,4 @@ gen-code:
 
 # All gen targets
 .PHONY: gen
-gen: gen-code gen-docs
+gen: gen-code generate-mocks gen-docs
diff --git a/plugins/source/datadog/client/mocks/incidents_api.go b/plugins/source/datadog/client/mocks/incidents_api.go
diff --git a/plugins/source/datadog/client/mocks/synthetics_api.go b/plugins/source/datadog/client/mocks/synthetics_api.go
diff --git a/plugins/source/datadog/client/services/incidents_api.go b/plugins/source/datadog/client/services/incidents_api.go
diff --git a/plugins/source/datadog/client/services/synthetics_api.go b/plugins/source/datadog/client/services/synthetics_api.go
diff --git a/plugins/source/datadog/codegen/services/generate.go b/plugins/source/datadog/codegen/services/generate.go
@@ -85,7 +85,7 @@ func shouldInclude(name string) bool {
 }
 
 type serviceInfo struct {
-	Import             string
+	Imports            []string
 	Alias              string
 	CreateFunctionName string
 	Name               string
@@ -98,6 +98,7 @@ func getServiceInfo(client any) serviceInfo {
 	v := reflect.ValueOf(client)
 	t := v.Type()
 	pkgPath := t.Elem().PkgPath()
+	imports := []string{pkgPath}
 	csr := caser.New()
 	alias := pkgPath[strings.LastIndex(pkgPath, "/")+1:]
 	pkgName := csr.ToSnake(t.Elem().Name())
@@ -108,11 +109,17 @@ func getServiceInfo(client any) serviceInfo {
 		method := t.Method(i)
 		if shouldInclude(method.Name) {
 			sig := signature(method.Name, v.Method(i).Interface())
-			signatures = append(signatures, sig)
+			// The following handles generic types in the signature
+			cleanSign := strings.Replace(sig, pkgPath, alias, 1)
+			// Add the import for pagination result
+			if strings.Contains(cleanSign, "datadog.PaginationResult") {
+				imports = append(imports, "github.com/DataDog/datadog-api-client-go/v2/api/datadog")
+			}
+			signatures = append(signatures, cleanSign)
 		}
 	}
 	return serviceInfo{
-		Import:             pkgPath,
+		Imports:            imports,
 		Alias:              alias,
 		CreateFunctionName: t.Elem().Name(),
 		Name:               name,

diff --git a/plugins/source/datadog/codegen/services/templates/service.go.tpl b/plugins/source/datadog/codegen/services/templates/service.go.tpl
@@ -5,7 +5,9 @@ import (
     "context"
     "net/http"
 
-    "{{ $.Import }}"
+    {{ range .Imports }}
+		"{{ . }}"
+    {{ end }}
 )
 
 //go:generate mockgen -package=mocks -destination=../mocks/{{$.PackageName}}.go -source={{$.PackageName}}.go {{$.ClientName}}

diff --git a/plugins/source/datadog/go.mod b/plugins/source/datadog/go.mod
@@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/datadog
 go 1.19
 
 require (
-	github.com/DataDog/datadog-api-client-go/v2 v2.5.0
+	github.com/DataDog/datadog-api-client-go/v2 v2.6.1
 	github.com/cloudquery/plugin-sdk v1.16.0
 	github.com/golang/mock v1.6.0
 	github.com/pkg/errors v0.9.1

diff --git a/plugins/source/datadog/go.sum b/plugins/source/datadog/go.sum
@@ -33,8 +33,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/DataDog/datadog-api-client-go/v2 v2.5.0 h1:+FRtNnR+IZ4D5lGqEk+f0+dSP7XhKtrlHvdcnTdyny8=
-github.com/DataDog/datadog-api-client-go/v2 v2.5.0/go.mod h1:98b/MtTwSAr/yhTfhCR1oxAqQ/4tMkdrgKH7fYiDA0g=
+github.com/DataDog/datadog-api-client-go/v2 v2.6.1 h1:THstTY4UQUFbojIoOOKjWdomc6Q0Gl1bAoCY0UOo2XY=
+github.com/DataDog/datadog-api-client-go/v2 v2.6.1/go.mod h1:sHt3EuVMN8PSYJu065qwp3pZxCwR3RZP4sJnYwj/ZQY=
 github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8=
 github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
 github.com/avast/retry-go/v4 v4.3.1 h1:Mtg11F9PdAIMkMiio2RKcYauoVHjl2aB3zQJJlzD4cE=

diff --git a/plugins/source/datadog/tools/tool.go b/plugins/source/datadog/tools/tool.go