From 84a7b506abefca083401d295426bc81b0f9fc7a0 Mon Sep 17 00:00:00 2001 From: Dominik Przybyl Date: Wed, 24 Jan 2024 12:40:54 +0100 Subject: [PATCH] Implement 'aws_ssm' connection type #26 --- examples/aws_ssm/aem.tf | 4 +--- examples/aws_ssm/main.tf | 2 -- internal/client/client_manager.go | 1 - internal/client/connection_aws_ssm.go | 3 +-- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/examples/aws_ssm/aem.tf b/examples/aws_ssm/aem.tf index 8df8b74..10f35e3 100644 --- a/examples/aws_ssm/aem.tf +++ b/examples/aws_ssm/aem.tf @@ -4,7 +4,6 @@ resource "aem_instance" "single" { client { type = "aws-ssm" settings = { - user = local.ssm_user instance_id = aws_instance.aem_single.id region = "eu-central-1" // TODO infer from AWS provider config } @@ -18,9 +17,8 @@ resource "aem_instance" "single" { "sudo mkfs -t ext4 ${local.aem_single_data_device}", "sudo mkdir -p ${local.aem_single_data_dir}", "sudo mount ${local.aem_single_data_device} ${local.aem_single_data_dir}", - "sudo chown -R ${local.ssm_user} ${local.aem_single_data_dir}", "echo '${local.aem_single_data_device} ${local.aem_single_data_dir} ext4 defaults 0 0' | sudo tee -a /etc/fstab", - // installing AWS CLI + // installing AWS CLI: https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html "sudo yum install -y unzip", "curl 'https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip' -o 'awscliv2.zip'", "unzip -q awscliv2.zip", diff --git a/examples/aws_ssm/main.tf b/examples/aws_ssm/main.tf index 0c674dd..fa739f2 100644 --- a/examples/aws_ssm/main.tf +++ b/examples/aws_ssm/main.tf @@ -18,8 +18,6 @@ locals { env_type = "aem-single" host = "aem_single" - ssm_user = "root" - tags = { Workspace = "aemc" Env = "tf-minimal" diff --git a/internal/client/client_manager.go b/internal/client/client_manager.go index e25e05e..386cb31 100644 --- a/internal/client/client_manager.go +++ b/internal/client/client_manager.go @@ -40,7 +40,6 @@ func (c ClientManager) connection(typeName string, settings map[string]string) ( }, nil case "aws-ssm": return &AWSSSMConnection{ - user: settings["user"], instanceId: settings["instance_id"], region: settings["region"], }, nil diff --git a/internal/client/connection_aws_ssm.go b/internal/client/connection_aws_ssm.go index 0fd0cff..79cbecf 100644 --- a/internal/client/connection_aws_ssm.go +++ b/internal/client/connection_aws_ssm.go @@ -13,7 +13,6 @@ import ( ) type AWSSSMConnection struct { - user string instanceId string region string ssmClient *ssm.Client @@ -25,7 +24,7 @@ func (a *AWSSSMConnection) Info() string { } func (a *AWSSSMConnection) User() string { - return a.user + return "root" } func (a *AWSSSMConnection) Connect() error {