From b7e67595fe647f172189ed47dcd7d1a9d1714894 Mon Sep 17 00:00:00 2001 From: Ali Abbas Jaffri Date: Fri, 20 Dec 2024 19:11:17 +0100 Subject: [PATCH 1/8] Changed terraform s3 backend from dynamodb to s3 lockfile Signed-off-by: Ali Abbas Jaffri --- src/mlinfra/stack_processor/deployment_processor/deployment.py | 2 +- src/mlinfra/stack_processor/provider_processor/aws_provider.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mlinfra/stack_processor/deployment_processor/deployment.py b/src/mlinfra/stack_processor/deployment_processor/deployment.py index 4bb51239..0a53b3a2 100644 --- a/src/mlinfra/stack_processor/deployment_processor/deployment.py +++ b/src/mlinfra/stack_processor/deployment_processor/deployment.py @@ -78,7 +78,7 @@ def get_provider_backend(self, provider: CloudProvider) -> dict: "s3": { "bucket": self.get_statefile_name(), "key": "ultimate-mlops-stack", - "dynamodb_table": self.get_statefile_name(), + "use_lockfile": True, "region": self.region, "encrypt": True, } diff --git a/src/mlinfra/stack_processor/provider_processor/aws_provider.py b/src/mlinfra/stack_processor/provider_processor/aws_provider.py index 19658ae3..1357d65f 100644 --- a/src/mlinfra/stack_processor/provider_processor/aws_provider.py +++ b/src/mlinfra/stack_processor/provider_processor/aws_provider.py @@ -97,7 +97,7 @@ def configure_provider(self): # "config": { # "bucket": self.get_statefile_name(), # "key": "ultimate-mlops-stack", - # "dynamodb_table": self.get_statefile_name(), + # "use_lockfile": True, # "region": self.region, # }, # } From 7882e1f6a3136dda58575d6399fae5d91e3fb987 Mon Sep 17 00:00:00 2001 From: Ali Abbas Jaffri Date: Fri, 20 Dec 2024 23:31:28 +0100 Subject: [PATCH 2/8] Updated terraform version Signed-off-by: Ali Abbas Jaffri --- .verified_terraform_versions | 3 +-- src/mlinfra/utils/utils.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.verified_terraform_versions b/.verified_terraform_versions index 43a90edd..758dc51f 100644 --- a/.verified_terraform_versions +++ b/.verified_terraform_versions @@ -1,6 +1,5 @@ { "verified": [ - "1.6.3", - "1.6.2" + "1.10.2" ] } diff --git a/src/mlinfra/utils/utils.py b/src/mlinfra/utils/utils.py index be817b10..3fbc7122 100644 --- a/src/mlinfra/utils/utils.py +++ b/src/mlinfra/utils/utils.py @@ -88,7 +88,7 @@ def create_symlinks(source: str, destination: str) -> None: def terraform_tested_version(): # TODO: read from a file and then populate this field - return "1.6.3" + return "1.10.2" # def _verify_aws_cloud_credentials(self) -> None: From c572ac9c0d4f040dfa16d479a1d2ce18e9906133 Mon Sep 17 00:00:00 2001 From: Ali Abbas Jaffri Date: Fri, 20 Dec 2024 23:48:40 +0100 Subject: [PATCH 3/8] Added terraform Signed-off-by: Ali Abbas Jaffri --- .github/actions/setup-python/action.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/actions/setup-python/action.yaml b/.github/actions/setup-python/action.yaml index 098cc74d..5bb90112 100644 --- a/.github/actions/setup-python/action.yaml +++ b/.github/actions/setup-python/action.yaml @@ -8,6 +8,14 @@ runs: with: # Install a specific version of uv. version: "0.4.30" + - name: Install terraform + run: | + TERRAFORM_VERSION=1.10.2 + git clone --depth=1 https://github.com/tfutils/tfenv.git ~/.tfenv + echo 'export PATH="$HOME/.tfenv/bin:$PATH"' >> ~/.bash_profile + TFENV_ARCH=arm64 tfenv install $TERRAFORM_VERSION + tfenv use $TERRAFORM_VERSION + shell: bash - name: Set up Python uses: actions/setup-python@v5 with: From 7f722b9c9ba5204982c5a0945bd5272d821f3fa7 Mon Sep 17 00:00:00 2001 From: Ali Abbas Jaffri Date: Fri, 20 Dec 2024 23:49:15 +0100 Subject: [PATCH 4/8] Updated lock Signed-off-by: Ali Abbas Jaffri --- uv.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uv.lock b/uv.lock index ccb5cc63..5d06bc57 100644 --- a/uv.lock +++ b/uv.lock @@ -538,7 +538,7 @@ wheels = [ [[package]] name = "mlinfra" -version = "0.0.25.dev26+g98ef64c.d20241129" +version = "0.0.25.dev5+g7882e1f.d20241220" source = { editable = "." } dependencies = [ { name = "boto3" }, From 24d43e9e87219a02904d0038f71dd91353929adc Mon Sep 17 00:00:00 2001 From: Ali Abbas Jaffri Date: Fri, 20 Dec 2024 23:51:20 +0100 Subject: [PATCH 5/8] Added terraform Signed-off-by: Ali Abbas Jaffri --- .github/actions/setup-python/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-python/action.yaml b/.github/actions/setup-python/action.yaml index 5bb90112..c5d055d4 100644 --- a/.github/actions/setup-python/action.yaml +++ b/.github/actions/setup-python/action.yaml @@ -13,7 +13,7 @@ runs: TERRAFORM_VERSION=1.10.2 git clone --depth=1 https://github.com/tfutils/tfenv.git ~/.tfenv echo 'export PATH="$HOME/.tfenv/bin:$PATH"' >> ~/.bash_profile - TFENV_ARCH=arm64 tfenv install $TERRAFORM_VERSION + tfenv install $TERRAFORM_VERSION tfenv use $TERRAFORM_VERSION shell: bash - name: Set up Python From 806f3fafac304d590052493bdd45cabb15fb95c8 Mon Sep 17 00:00:00 2001 From: Ali Abbas Jaffri Date: Fri, 20 Dec 2024 23:57:07 +0100 Subject: [PATCH 6/8] Added terraform Signed-off-by: Ali Abbas Jaffri --- .github/actions/setup-python/action.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-python/action.yaml b/.github/actions/setup-python/action.yaml index c5d055d4..b9021b62 100644 --- a/.github/actions/setup-python/action.yaml +++ b/.github/actions/setup-python/action.yaml @@ -11,8 +11,9 @@ runs: - name: Install terraform run: | TERRAFORM_VERSION=1.10.2 - git clone --depth=1 https://github.com/tfutils/tfenv.git ~/.tfenv - echo 'export PATH="$HOME/.tfenv/bin:$PATH"' >> ~/.bash_profile + git clone https://github.com/tfutils/tfenv.git ${HOME}/.tfenv + export PATH="${HOME}/.tfenv/bin:${PATH}" + echo 'export PATH="$HOME/.tfenv/bin:$PATH"' >> ${HOME}/.profile tfenv install $TERRAFORM_VERSION tfenv use $TERRAFORM_VERSION shell: bash From ffbc0c0421c5a70aa1688d7f147640d4d24c6039 Mon Sep 17 00:00:00 2001 From: Ali Abbas Jaffri Date: Sat, 21 Dec 2024 00:01:08 +0100 Subject: [PATCH 7/8] Added terraform version file Signed-off-by: Ali Abbas Jaffri --- .terraform-version | 1 + .verified_terraform_versions | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) create mode 100644 .terraform-version delete mode 100644 .verified_terraform_versions diff --git a/.terraform-version b/.terraform-version new file mode 100644 index 00000000..5ad2491c --- /dev/null +++ b/.terraform-version @@ -0,0 +1 @@ +1.10.2 diff --git a/.verified_terraform_versions b/.verified_terraform_versions deleted file mode 100644 index 758dc51f..00000000 --- a/.verified_terraform_versions +++ /dev/null @@ -1,5 +0,0 @@ -{ - "verified": [ - "1.10.2" - ] -} From d8e22d2a0d23d6507e0ba4d2b7a11f0ba6d2437b Mon Sep 17 00:00:00 2001 From: Ali Abbas Jaffri Date: Sat, 21 Dec 2024 00:11:45 +0100 Subject: [PATCH 8/8] Added terraform Signed-off-by: Ali Abbas Jaffri --- .github/actions/setup-python/action.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/actions/setup-python/action.yaml b/.github/actions/setup-python/action.yaml index b9021b62..95cd0c69 100644 --- a/.github/actions/setup-python/action.yaml +++ b/.github/actions/setup-python/action.yaml @@ -8,15 +8,14 @@ runs: with: # Install a specific version of uv. version: "0.4.30" - - name: Install terraform + - name: Get Terraform Version + id: tf_version run: | - TERRAFORM_VERSION=1.10.2 - git clone https://github.com/tfutils/tfenv.git ${HOME}/.tfenv - export PATH="${HOME}/.tfenv/bin:${PATH}" - echo 'export PATH="$HOME/.tfenv/bin:$PATH"' >> ${HOME}/.profile - tfenv install $TERRAFORM_VERSION - tfenv use $TERRAFORM_VERSION + echo "value=$(cat .terraform-version)" >> $GITHUB_OUTPUT shell: bash + - uses: hashicorp/setup-terraform@v3 + with: + terraform_version: ${{ steps.env_name.outputs.value }} - name: Set up Python uses: actions/setup-python@v5 with: