sync apply command with latest generate options (#54)

Author: helderjs

docs/command/atlas-kubernetes-config-apply.txt

@@ -41,10 +41,18 @@ Options
      - strings
      - false
      - One or more comma separated cluster names to import
+   * - --dataFederationName
+     - strings
+     - false
+     - One or more comma separated data federation names to import
    * - -h, --help
      - 
      - false
      - help for apply
+   * - --independentResources
+     - 
+     - false
+     - Flag that makes the generated resources that support independent usage, to use external IDs rather than Kubernetes references.
    * - --kubeContext
      - string
      - false

go.mod

@@ -25,6 +25,7 @@ require (
 	go.mongodb.org/atlas v0.37.0
 	go.mongodb.org/atlas-sdk/v20240530005 v20240530005.0.0
 	go.mongodb.org/atlas-sdk/v20241113004 v20241113004.0.0
+	go.mongodb.org/atlas-sdk/v20250219001 v20250219001.1.0
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.32.3

go.sum

@@ -259,6 +259,8 @@ go.mongodb.org/atlas-sdk/v20241113001 v20241113001.0.0 h1:G3UZcWwWziGUuaILWp/Gc+
 go.mongodb.org/atlas-sdk/v20241113001 v20241113001.0.0/go.mod h1:fMiUyCacIAm+XwFkJ4j+rJtYLRsGU7hButtgGv+SBU4=
 go.mongodb.org/atlas-sdk/v20241113004 v20241113004.0.0 h1:dmIp82dS4foajdKgcKRfr26g0cWE52jQAf+nbgFXr10=
 go.mongodb.org/atlas-sdk/v20241113004 v20241113004.0.0/go.mod h1:z6m7PcfItkgV3+mnLuStlTkdTbfUBQJpRyES8tuHNCk=
+go.mongodb.org/atlas-sdk/v20250219001 v20250219001.1.0 h1:tm7d3xvbNFIpuvFcppXc1zdpM/dO7HwivpA+Y4np3uQ=
+go.mongodb.org/atlas-sdk/v20250219001 v20250219001.1.0/go.mod h1:huR1gWJhExa60NIRhsLDdc7RmmqKJJwnbdlA1UUh8V4=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s=

internal/cli/kubernetes/config/apply.go

@@ -105,7 +105,9 @@ func (opts *ApplyOpts) Run() error {
 		WithTargetOperatorVersion(opts.operatorVersion).
 		WithSecretsData(true).
 		WithFeatureValidator(atlasCRDs).
-		WithPatcher(atlasCRDs)
+		WithPatcher(atlasCRDs).
+		WithDataFederationNames(opts.dataFederationName).
+		WithIndependentResources(opts.independentResources)
 	err = operator.NewConfigApply(
 		operator.NewConfigApplyParams{
 			OrgID:     opts.OrgID,
@@ -169,6 +171,8 @@ func ApplyBuilder() *cobra.Command {
 	flags.StringVar(&opts.operatorVersion, flag.OperatorVersion, "", usage.OperatorVersion)
 	flags.StringVar(&opts.KubeConfig, flag.KubernetesClusterConfig, "", usage.KubernetesClusterConfig)
 	flags.StringVar(&opts.KubeContext, flag.KubernetesClusterContext, "", usage.KubernetesClusterContext)
+	flags.StringSliceVar(&opts.dataFederationName, flag.DataFederationName, []string{}, usage.ExporterDataFederationName)
+	flags.BoolVar(&opts.independentResources, flag.IndependentResources, false, usage.IndependentResources)
 
 	return cmd
 }

internal/kubernetes/operator/config_apply.go

@@ -84,7 +84,12 @@ func (apply *ConfigApply) Run() error {
 		return err
 	}
 
-	sortedResources := sortResources(ProjectResources, DeploymentResources, streamsResources, apply.Version)
+	dataFederationResources, err := apply.exporter.exportDataFederation(projectName)
+	if err != nil {
+		return err
+	}
+
+	sortedResources := sortResources(ProjectResources, DeploymentResources, streamsResources, dataFederationResources, apply.Version)
 
 	for _, objects := range sortedResources {
 		for _, object := range objects {
@@ -111,7 +116,7 @@ func (apply *ConfigApply) Run() error {
 }
 
 func sortResources(
-	projectResources, deploymentResources, streamsResources []runtime.Object,
+	projectResources, deploymentResources, streamsResources, dataFederationResources []runtime.Object,
 	version string,
 ) [][]runtime.Object {
 	resources, versionFound := features.GetResourcesForVersion(version)
@@ -167,5 +172,7 @@ func sortResources(
 		}
 	}
 
+	sortedResources[9] = append(sortedResources[9], dataFederationResources...)
+
 	return sortedResources
 }

scripts/atlas-binary.sh

@@ -18,6 +18,7 @@ set -Eeou pipefail
 
 OS=$(uname -s)
 ARCH=$(uname -m)
+CLI_VERSION="1.41.0"
 
 echo "==> Fetching AtlasCLI binary..."
 if ls ./test/bin/atlas* 1> /dev/null 2>&1; then
@@ -30,21 +31,21 @@ mkdir -p ./test/bin
 
 if [ "$OS" = "Darwin" ]; then
     if [ "$ARCH" = "arm64" ]; then
-        curl -L https://fastdl.mongodb.org/mongocli/mongodb-atlas-cli_1.36.0_macos_arm64.zip -o ./test/bin/mongodb-atlas-cli.zip
+        curl -L https://fastdl.mongodb.org/mongocli/mongodb-atlas-cli_${CLI_VERSION}_macos_arm64.zip -o ./test/bin/mongodb-atlas-cli.zip
     elif [ "$ARCH" = "x86_64" ]; then
-        curl -L https://fastdl.mongodb.org/mongocli/mongodb-atlas-cli_1.36.0_macos_x86_64.zip -o ./test/bin/mongodb-atlas-cli.zip
+        curl -L https://fastdl.mongodb.org/mongocli/mongodb-atlas-cli_${CLI_VERSION}_macos_x86_64.zip -o ./test/bin/mongodb-atlas-cli.zip
     fi
     unzip -q ./test/bin/mongodb-atlas-cli.zip -d ./test/bin/tmp
 elif [ "$OS" = "Linux" ]; then
     if [ "$ARCH" = "x86_64" ]; then
-        curl -L https://fastdl.mongodb.org/mongocli/mongodb-atlas-cli_1.36.0_linux_x86_64.tar.gz -o ./test/bin/mongodb-atlas-cli.tar.gz
+        curl -L https://fastdl.mongodb.org/mongocli/mongodb-atlas-cli_${CLI_VERSION}_linux_x86_64.tar.gz -o ./test/bin/mongodb-atlas-cli.tar.gz
     elif [ "$ARCH" = "aarch64" ]; then
-        curl -L https://fastdl.mongodb.org/mongocli/mongodb-atlas-cli_1.36.0_linux_arm64.tar.gz -o ./test/bin/mongodb-atlas-cli.tar.gz
+        curl -L https://fastdl.mongodb.org/mongocli/mongodb-atlas-cli_${CLI_VERSION}_linux_arm64.tar.gz -o ./test/bin/mongodb-atlas-cli.tar.gz
     fi
     mkdir -p ./test/bin/tmp
     tar --strip-components=1 -xf ./test/bin/mongodb-atlas-cli.tar.gz -C ./test/bin/tmp
 elif [[ "$OS" =~ "MINGW" ]] || [[ "$OS" =~ "MSYS_NT" ]] || [[ "$OS" =~ "CYGWIN_NT" ]]; then
-    curl -L https://fastdl.mongodb.org/mongocli/mongodb-atlas-cli_1.36.0_windows_x86_64.zip -o ./test/bin/mongodb-atlas-cli.zip
+    curl -L https://fastdl.mongodb.org/mongocli/mongodb-atlas-cli_${CLI_VERSION}_windows_x86_64.zip -o ./test/bin/mongodb-atlas-cli.zip
     unzip -q ./test/bin/mongodb-atlas-cli.zip -d ./test/bin/tmp
 else
     echo "Unsupported OS or architecture"

test/e2e/helper_test.go

@@ -30,10 +30,16 @@ import (
 	"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/kubernetes/operator/resources"
 	"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/version"
 	"github.com/mongodb/atlas-cli-plugin-kubernetes/test"
+	akoapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/api"
+	akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1"
+	akov2common "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common"
+	akov2status "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/status"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	atlasv2 "go.mongodb.org/atlas-sdk/v20241113004/admin"
+	atlasv20250219001 "go.mongodb.org/atlas-sdk/v20250219001/admin"
 	"go.mongodb.org/atlas/mongodbatlas"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const (
@@ -342,9 +348,6 @@ func RandProjectName() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	if revision, ok := os.LookupEnv("revision"); ok {
-		return fmt.Sprintf("%v-%s", n, revision), nil
-	}
 	return fmt.Sprintf("e2e-%v", n), nil
 }
 
@@ -410,7 +413,7 @@ func getFirstOrgUser() (string, error) {
 		return "", fmt.Errorf("%s (%w)", string(resp), err)
 	}
 
-	var users atlasv2.PaginatedAppUser
+	var users atlasv20250219001.PaginatedOrgUser
 	if err := json.Unmarshal(resp, &users); err != nil {
 		return "", fmt.Errorf("%w: %s", err, string(resp))
 	}
@@ -827,3 +830,39 @@ func randomString(t *testing.T) string {
 	}
 	return fmt.Sprintf("%x", n)
 }
+
+func referenceDataFederation(name, namespace, projectName string, labels map[string]string) *akov2.AtlasDataFederation {
+	dictionary := resources.AtlasNameToKubernetesName()
+	return &akov2.AtlasDataFederation{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "AtlasDataFederation",
+			APIVersion: "atlas.mongodb.com/v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      resources.NormalizeAtlasName(fmt.Sprintf("%s-%s", projectName, name), dictionary),
+			Namespace: namespace,
+			Labels:    labels,
+		},
+		Spec: akov2.DataFederationSpec{
+			Project: akov2common.ResourceRefNamespaced{
+				Name:      resources.NormalizeAtlasName(projectName, dictionary),
+				Namespace: namespace,
+			},
+			Name:                name,
+			CloudProviderConfig: &akov2.CloudProviderConfig{},
+			DataProcessRegion: &akov2.DataProcessRegion{
+				CloudProvider: "AWS",
+				Region:        "DUBLIN_IRL",
+			},
+			Storage: &akov2.Storage{
+				Databases: nil,
+				Stores:    nil,
+			},
+		},
+		Status: akov2status.DataFederationStatus{
+			Common: akoapi.Common{
+				Conditions: []akoapi.Condition{},
+			},
+		},
+	}
+}