Schema fixes

wttech · Aug 27, 2023 · ca2827d · ca2827d
1 parent ca8f770
commit ca2827d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -22,16 +22,18 @@ resource "aws_instance" "aem_author" {
 resource "aem_instance" "author" {
   depends_on = [aws_instance.aem_author]
   
-  config {
+  compose {
+    root_dir = "/mnt/aemc"
+    version = "1.4.1"
     lib_dir = "lib" # files copied once over SCP before creating instance 
-    file = "aem.yml" # https://github.com/wttech/aemc/blob/0ca8bdeb17be0457ce4bea43621d8abe08948431/pkg/project/app_classic/aem/default/etc/aem.yml
+    config_file = "aem.yml" # https://github.com/wttech/aemc/blob/0ca8bdeb17be0457ce4bea43621d8abe08948431/pkg/project/app_classic/aem/default/etc/aem.yml
     instance_id = "local_author"
   }
   
-  connection {
+  client {
     type = "aws_ssm"
     params = {
-      instance_id: aws_instance.aem_author.id
+      instance_id = aws_instance.aem_author.id
     }
     /*
     type = "ssh"

diff --git a/develop.sh b/develop.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+RED='\033[0;31m'
+NC='\033[0m'
+
 TF_DIR=$1
 if [ -z "$TF_DIR" ]
 then
@@ -12,7 +15,7 @@ go install .
 BUILD_STATUS="$?"
 if [ "$BUILD_STATUS" -ne 0 ]
 then
-  echo "Build error (exit code $BUILD_STATUS)"
+  echo "${RED}Build error (exit code $BUILD_STATUS)${NC}"
   exit 1
 fi
 

diff --git a/examples/minimal/main.tf b/examples/minimal/main.tf
@@ -54,16 +54,14 @@ resource "aem_instance" "author" {
       host = aws_instance.aem_author.public_ip
       port = 22
       user = "ec2-user"
-      private_key = local.ssh_private_key // TODO hide it
+      private_key = local.ssh_private_key // TODO hide it in TF console outputs
     }
   }
   compose {
+    data_dir = "/data/aemc"
     version = "1.4.1"
     lib_dir = "lib"
     config_file = "aem.yml"
     instance_id = "local_author"
   }
-  machine {
-    data_dir = "/data/aemc"
-  }
 }
diff --git a/internal/provider/instance_resource.go b/internal/provider/instance_resource.go
@@ -31,10 +31,8 @@ type InstanceResourceModel struct {
 		Type     types.String `tfsdk:"type"`
 		Settings types.Map    `tfsdk:"settings"`
 	} `tfsdk:"client"`
-	Machine struct {
-		DataDir types.String `tfsdk:"data_dir"`
-	} `tfsdk:"machine"`
 	Compose struct {
+		DataDir    types.String `tfsdk:"data_dir"`
 		Version    types.String `tfsdk:"version"`
 		ConfigFile types.String `tfsdk:"config_file"`
 		LibDir     types.String `tfsdk:"lib_dir"`
@@ -59,40 +57,36 @@ func (r *InstanceResource) Schema(ctx context.Context, req resource.SchemaReques
 					},
 				},
 			},
-			"machine": schema.SingleNestedBlock{
+			"compose": schema.SingleNestedBlock{
 				Attributes: map[string]schema.Attribute{
 					"data_dir": schema.StringAttribute{
-						MarkdownDescription: "Root path which AEM instance(s) will be stored",
+						MarkdownDescription: "Remote path in which AEM Compose data will be stored",
 						Computed:            true,
 						Optional:            true,
-						Default:             stringdefault.StaticString("/data/aemc"),
+						Default:             stringdefault.StaticString("/mnt/aemc"),
 					},
-				},
-			},
-			"compose": schema.SingleNestedBlock{
-				Attributes: map[string]schema.Attribute{
 					"version": schema.StringAttribute{
-						MarkdownDescription: "Version of AEM Compose CLI to use",
+						MarkdownDescription: "Version of AEM Compose tool to use on remote AEM machine",
 						Computed:            true,
 						Optional:            true,
 						Default:             stringdefault.StaticString("1.4.1"),
 					},
-					"instance_id": schema.StringAttribute{
-						MarkdownDescription: "ID of the AEM instance to use (one of the instances defined in the configuration file)",
-						Optional:            true,
-					},
 					"config_file": schema.StringAttribute{
-						MarkdownDescription: "Path to the AEM configuration file",
+						MarkdownDescription: "Local path to the AEM configuration file",
 						Computed:            true,
 						Optional:            true,
 						Default:             stringdefault.StaticString("aem.yml"),
 					},
 					"lib_dir": schema.StringAttribute{
-						MarkdownDescription: "Path to the AEM library directory",
+						MarkdownDescription: "Local path to directory from which AEM library files will be copied to the remote AEM machine",
 						Computed:            true,
 						Optional:            true,
 						Default:             stringdefault.StaticString("lib"),
 					},
+					"instance_id": schema.StringAttribute{
+						MarkdownDescription: "ID of the AEM instance to use (one of the instances defined in the configuration file)",
+						Optional:            true,
+					},
 				},
 			},
 		},
@@ -144,7 +138,7 @@ func (r *InstanceResource) Create(ctx context.Context, req resource.CreateReques
 
 	tflog.Trace(ctx, "creating AEM instance resource")
 
-	if err := conn.CopyFile(data.Compose.ConfigFile.String(), fmt.Sprintf("%s/aem/default/etc/aem.yml", data.Machine.DataDir.String())); err != nil {
+	if err := conn.CopyFile(data.Compose.ConfigFile.String(), fmt.Sprintf("%s/aem/default/etc/aem.yml", data.Compose.DataDir.String())); err != nil {
 		resp.Diagnostics.AddError("AEM instance error", fmt.Sprintf("Unable to copy AEM configuration file, got error: %s", err))
 		return
 	}