internal/controller: login atlas cloud via project config (#275)

Author: datdao

charts/atlas-operator/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: atlas-operator
 description: The Atlas Kubernetes Operator
 type: application
-version: 0.7.3
-appVersion: 0.7.3
+version: 0.7.4
+appVersion: 0.7.4

go.mod

@@ -6,7 +6,7 @@ toolchain go1.23.2
 
 require (
 	ariga.io/atlas v0.28.1
-	ariga.io/atlas-go-sdk v0.6.4
+	ariga.io/atlas-go-sdk v0.6.7
 	github.com/hashicorp/hcl/v2 v2.18.1
 	github.com/rogpeppe/go-internal v1.13.1
 	github.com/stretchr/testify v1.9.0

go.sum

@@ -1,7 +1,7 @@
 ariga.io/atlas v0.28.1 h1:cNE0FYmoYs1u4KF+FGnp2on1srhM6FDpjaCgL7Rd8/c=
 ariga.io/atlas v0.28.1/go.mod h1:LOOp18LCL9r+VifvVlJqgYJwYl271rrXD9/wIyzJ8sw=
-ariga.io/atlas-go-sdk v0.6.4 h1:6iSUoMkHi7CijzxW4c+iMly53UFdw07HX8ECRglkUR4=
-ariga.io/atlas-go-sdk v0.6.4/go.mod h1:9Q+/04PVyJHUse1lEE9Kp6E18xj/6mIzaUTcWYSjSnQ=
+ariga.io/atlas-go-sdk v0.6.7 h1:FEM+1kTmJsqCm4Tud9fIkdGshDQf3lO/eSjYpyy4+xg=
+ariga.io/atlas-go-sdk v0.6.7/go.mod h1:9Q+/04PVyJHUse1lEE9Kp6E18xj/6mIzaUTcWYSjSnQ=
 github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
 github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=

internal/controller/atlasmigration_controller.go

@@ -259,12 +259,12 @@ func (r *AtlasMigrationReconciler) reconcile(ctx context.Context, data *migratio
 		return r.resultErr(res, err, "ReadingMigrationData")
 	}
 	defer wd.Close()
-	c, err := r.atlasClient(wd.Path(), data.Cloud)
+	c, err := r.atlasClient(wd.Path(), nil)
 	if err != nil {
 		return r.resultErr(res, err, dbv1alpha1.ReasonCreatingAtlasClient)
 	}
 	var whoami *atlasexec.WhoAmI
-	switch whoami, err = c.WhoAmI(ctx); {
+	switch whoami, err = c.WhoAmI(ctx, &atlasexec.WhoAmIParams{Vars: data.Vars}); {
 	case errors.Is(err, atlasexec.ErrRequireLogin):
 		log.Info("the resource is not connected to Atlas Cloud")
 		if data.Config != nil {

internal/controller/atlasschema_controller.go

@@ -164,7 +164,7 @@ func (r *AtlasSchemaReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		_, err = wd.WriteFile("atlas.hcl", buf.Bytes())
 		return err
 	}
-	cli, err := r.atlasClient(wd.Path(), data.Cloud)
+	cli, err := r.atlasClient(wd.Path(), nil)
 	if err != nil {
 		return r.resultErr(res, err, dbv1alpha1.ReasonCreatingAtlasClient)
 	}
@@ -190,7 +190,7 @@ func (r *AtlasSchemaReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	// Below this line is the main logic of the controller.
 	// ====================================================
 	var whoami *atlasexec.WhoAmI
-	switch whoami, err = cli.WhoAmI(ctx); {
+	switch whoami, err = cli.WhoAmI(ctx, &atlasexec.WhoAmIParams{Vars: data.Vars}); {
 	case errors.Is(err, atlasexec.ErrRequireLogin):
 		log.Info("the resource is not connected to Atlas Cloud")
 		if data.Config != nil {
@@ -823,6 +823,20 @@ func (d *managedData) setLintReview(v dbv1alpha1.LintReview, force bool) {
 // asBlocks returns the HCL block for the environment configuration.
 func (d *managedData) asBlocks() []*hclwrite.Block {
 	var blocks []*hclwrite.Block
+	if d.Cloud != nil {
+		atlas := hclwrite.NewBlock("atlas", nil)
+		cloud := atlas.Body().AppendNewBlock("cloud", nil).Body()
+		if d.Cloud.Token != "" {
+			cloud.SetAttributeValue("token", cty.StringVal(d.Cloud.Token))
+		}
+		if d.Cloud.URL != "" {
+			cloud.SetAttributeValue("url", cty.StringVal(d.Cloud.URL))
+		}
+		if d.Cloud.Repo != "" {
+			cloud.SetAttributeValue("project", cty.StringVal(d.Cloud.Repo))
+		}
+		blocks = append(blocks, atlas)
+	}
 	env := hclwrite.NewBlock("env", []string{d.EnvName})
 	blocks = append(blocks, env)
 	envBody := env.Body()

internal/controller/common.go

@@ -68,7 +68,7 @@ type (
 		// SchemaPlanList runs the `schema plan list` command.
 		SchemaPlanList(context.Context, *atlasexec.SchemaPlanListParams) ([]atlasexec.SchemaPlanFile, error)
 		// WhoAmI runs the `whoami` command.
-		WhoAmI(ctx context.Context) (*atlasexec.WhoAmI, error)
+		WhoAmI(context.Context, *atlasexec.WhoAmIParams) (*atlasexec.WhoAmI, error)
 	}
 	// AtlasExecFn is a function that returns an AtlasExec
 	// with the working directory.

internal/controller/testhelper.go

@@ -78,7 +78,7 @@ func (m *mockAtlasExec) SchemaPush(context.Context, *atlasexec.SchemaPushParams)
 	return m.schemaPush.res, m.schemaPush.err
 }
 
-func (m *mockAtlasExec) WhoAmI(context.Context) (*atlasexec.WhoAmI, error) {
+func (m *mockAtlasExec) WhoAmI(context.Context, *atlasexec.WhoAmIParams) (*atlasexec.WhoAmI, error) {
 	return m.whoami.res, m.whoami.err
 }