Moving the 'cloudfoundry' package inside 'cloudproviders'

DataDog · Nov 3, 2021 · 7538b9a · 7538b9a
1 parent 7d00d93
commit 7538b9a
Show file tree

Hide file tree

Showing 22 changed files with 11 additions and 11 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -168,7 +168,7 @@
 /pkg/otlp/                              @DataDog/agent-platform
 /pkg/tagger/                            @DataDog/container-integrations
 /pkg/tagger/collectors/garden*.go       @DataDog/integrations-tools-and-libraries
-/pkg/util/cloudfoundry/                 @DataDog/integrations-tools-and-libraries
+/pkg/util/cloudproviders/cloudfoundry/  @DataDog/integrations-tools-and-libraries
 /pkg/util/clusteragent/                 @DataDog/container-integrations
 /pkg/util/containerd/                   @DataDog/container-integrations
 /pkg/util/containers/                   @DataDog/container-integrations

diff --git a/.golangci.yml b/.golangci.yml
@@ -2,7 +2,7 @@ run:
   skip-files:
     - cmd/agent/app/reloadcheck.go # ignore unused command for now
     - cmd/agent/app/listchecks.go  # ignore unused command for now
-    - pkg/util/cloudfoundry/bbscache_test.go # implements interface from imported package whose method names fail linting
+    - pkg/util/cloudproviders/cloudfoundry/bbscache_test.go # implements interface from imported package whose method names fail linting
   skip-dirs:
     # ignore test helper
     - pkg/util/testutil

diff --git a/cmd/cluster-agent/api/v1/cloudfoundry_metadata.go b/cmd/cluster-agent/api/v1/cloudfoundry_metadata.go
@@ -12,7 +12,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/DataDog/datadog-agent/pkg/util/cloudfoundry"
+	"github.com/DataDog/datadog-agent/pkg/util/cloudproviders/cloudfoundry"
 	"github.com/DataDog/datadog-agent/pkg/util/log"
 	"github.com/gorilla/mux"
 )

diff --git a/pkg/autodiscovery/listeners/cloudfoundry.go b/pkg/autodiscovery/listeners/cloudfoundry.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/DataDog/datadog-agent/pkg/autodiscovery/integration"
-	"github.com/DataDog/datadog-agent/pkg/util/cloudfoundry"
+	"github.com/DataDog/datadog-agent/pkg/util/cloudproviders/cloudfoundry"
 	"github.com/DataDog/datadog-agent/pkg/util/containers"
 	"github.com/DataDog/datadog-agent/pkg/util/log"
 )

diff --git a/pkg/autodiscovery/listeners/cloudfoundry_test.go b/pkg/autodiscovery/listeners/cloudfoundry_test.go
@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/DataDog/datadog-agent/pkg/autodiscovery/integration"
-	"github.com/DataDog/datadog-agent/pkg/util/cloudfoundry"
+	"github.com/DataDog/datadog-agent/pkg/util/cloudproviders/cloudfoundry"
 	"github.com/DataDog/datadog-agent/pkg/util/testutil"
 
 	"github.com/stretchr/testify/assert"

diff --git a/pkg/autodiscovery/providers/cloudfoundry.go b/pkg/autodiscovery/providers/cloudfoundry.go
@@ -17,7 +17,7 @@ import (
 	"github.com/DataDog/datadog-agent/pkg/autodiscovery/integration"
 	"github.com/DataDog/datadog-agent/pkg/autodiscovery/providers/names"
 	"github.com/DataDog/datadog-agent/pkg/config"
-	"github.com/DataDog/datadog-agent/pkg/util/cloudfoundry"
+	"github.com/DataDog/datadog-agent/pkg/util/cloudproviders/cloudfoundry"
 	"github.com/DataDog/datadog-agent/pkg/util/log"
 
 	"github.com/bhmj/jsonslice"

diff --git a/pkg/autodiscovery/providers/cloudfoundry_test.go b/pkg/autodiscovery/providers/cloudfoundry_test.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/DataDog/datadog-agent/pkg/autodiscovery/integration"
-	"github.com/DataDog/datadog-agent/pkg/util/cloudfoundry"
+	"github.com/DataDog/datadog-agent/pkg/util/cloudproviders/cloudfoundry"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/tagger/collectors/garden_extract.go b/pkg/tagger/collectors/garden_extract.go
@@ -3,7 +3,7 @@ package collectors
 import (
 	"fmt"
 
-	"github.com/DataDog/datadog-agent/pkg/util/cloudfoundry"
+	"github.com/DataDog/datadog-agent/pkg/util/cloudproviders/cloudfoundry"
 	"github.com/DataDog/datadog-agent/pkg/util/log"
 )
 

diff --git a/pkg/tagger/collectors/garden_main.go b/pkg/tagger/collectors/garden_main.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 
 	"github.com/DataDog/datadog-agent/pkg/config"
-	"github.com/DataDog/datadog-agent/pkg/util/cloudfoundry"
+	"github.com/DataDog/datadog-agent/pkg/util/cloudproviders/cloudfoundry"
 	"github.com/DataDog/datadog-agent/pkg/util/clusteragent"
 	"github.com/DataDog/datadog-agent/pkg/util/containers"
 	"github.com/DataDog/datadog-agent/pkg/util/log"

diff --git a/pkg/util/cloudfoundry/bbscache.go → ...l/cloudproviders/cloudfoundry/bbscache.go b/pkg/util/cloudfoundry/bbscache.go → ...l/cloudproviders/cloudfoundry/bbscache.go
diff --git a/pkg/util/cloudfoundry/bbscache_test.go → ...udproviders/cloudfoundry/bbscache_test.go b/pkg/util/cloudfoundry/bbscache_test.go → ...udproviders/cloudfoundry/bbscache_test.go
diff --git a/pkg/util/cloudfoundry/cccache.go → ...il/cloudproviders/cloudfoundry/cccache.go b/pkg/util/cloudfoundry/cccache.go → ...il/cloudproviders/cloudfoundry/cccache.go
diff --git a/pkg/util/cloudfoundry/cccache_test.go → ...oudproviders/cloudfoundry/cccache_test.go b/pkg/util/cloudfoundry/cccache_test.go → ...oudproviders/cloudfoundry/cccache_test.go
diff --git a/pkg/util/cloudfoundry/cloudfoundry.go → ...oudproviders/cloudfoundry/cloudfoundry.go b/pkg/util/cloudfoundry/cloudfoundry.go → ...oudproviders/cloudfoundry/cloudfoundry.go
diff --git a/pkg/util/cloudfoundry/cloudfoundry_test.go → ...oviders/cloudfoundry/cloudfoundry_test.go b/pkg/util/cloudfoundry/cloudfoundry_test.go → ...oviders/cloudfoundry/cloudfoundry_test.go
diff --git a/pkg/util/cloudfoundry/garden.go → ...til/cloudproviders/cloudfoundry/garden.go b/pkg/util/cloudfoundry/garden.go → ...til/cloudproviders/cloudfoundry/garden.go
diff --git a/pkg/util/cloudfoundry/garden_test.go → ...loudproviders/cloudfoundry/garden_test.go b/pkg/util/cloudfoundry/garden_test.go → ...loudproviders/cloudfoundry/garden_test.go
diff --git a/pkg/util/cloudfoundry/main_test.go → .../cloudproviders/cloudfoundry/main_test.go b/pkg/util/cloudfoundry/main_test.go → .../cloudproviders/cloudfoundry/main_test.go
diff --git a/pkg/util/cloudfoundry/types.go → ...util/cloudproviders/cloudfoundry/types.go b/pkg/util/cloudfoundry/types.go → ...util/cloudproviders/cloudfoundry/types.go
diff --git a/pkg/util/cloudfoundry/types_test.go → ...cloudproviders/cloudfoundry/types_test.go b/pkg/util/cloudfoundry/types_test.go → ...cloudproviders/cloudfoundry/types_test.go
diff --git a/pkg/util/cloudproviders/cloudproviders.go b/pkg/util/cloudproviders/cloudproviders.go
@@ -15,12 +15,12 @@ import (
 	"github.com/DataDog/datadog-agent/pkg/util/hostname/kubelet"
 	"github.com/DataDog/datadog-agent/pkg/util/log"
 
-	"github.com/DataDog/datadog-agent/pkg/util/cloudfoundry"
 	"github.com/DataDog/datadog-agent/pkg/util/ec2"
 	"github.com/DataDog/datadog-agent/pkg/util/ecs"
 
 	"github.com/DataDog/datadog-agent/pkg/util/cloudproviders/alibaba"
 	"github.com/DataDog/datadog-agent/pkg/util/cloudproviders/azure"
+	"github.com/DataDog/datadog-agent/pkg/util/cloudproviders/cloudfoundry"
 	"github.com/DataDog/datadog-agent/pkg/util/cloudproviders/gce"
 	"github.com/DataDog/datadog-agent/pkg/util/cloudproviders/tencent"
 )

diff --git a/pkg/util/containers/collectors/cloudfoundry.go b/pkg/util/containers/collectors/cloudfoundry.go
@@ -6,7 +6,7 @@
 package collectors
 
 import (
-	"github.com/DataDog/datadog-agent/pkg/util/cloudfoundry"
+	"github.com/DataDog/datadog-agent/pkg/util/cloudproviders/cloudfoundry"
 	"github.com/DataDog/datadog-agent/pkg/util/containers"
 )