Skip to content

Commit 063c272

Browse files
committed
refacto part1
1 parent af2f1d5 commit 063c272

223 files changed

Lines changed: 6857 additions & 6562 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# EditorConfig is awesome: http://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
charset = utf-8
9+
end_of_line = lf
10+
indent_size = 2
11+
indent_style = space
12+
insert_final_newline = true
13+
max_line_length = 80
14+
trim_trailing_whitespace = true
15+
16+
[*.{tf,tfvars}]
17+
indent_size = 2
18+
indent_style = space
19+
20+
[*.md]
21+
max_line_length = 0
22+
trim_trailing_whitespace = false
23+
insert_final_newline = false
24+
25+
# Tab indentation (no size specified)
26+
[Makefile]
27+
tab_width = 2
28+
indent_style = tab
29+
30+
[COMMIT_EDITMSG]
31+
max_line_length = 0

.github/workflows/ansible-ci.yml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
1-
name: Ansible Molecule
1+
# name: Ansible Molecule
22

3-
on:
4-
push:
5-
branches:
6-
- main
7-
paths:
8-
- '.github/**'
9-
- '_tools/ansible/**'
10-
pull_request:
11-
branches:
12-
- '*'
13-
paths:
14-
- '.github/**'
15-
- '_tools/ansible/**'
3+
# on:
4+
# push:
5+
# branches:
6+
# - main
7+
# paths:
8+
# - '.github/**'
9+
# - '_tools/ansible/**'
10+
# pull_request:
11+
# branches:
12+
# - '*'
13+
# paths:
14+
# - '.github/**'
15+
# - '_tools/ansible/**'
1616

17-
jobs:
18-
aws-cli:
19-
name: AWScli Role
20-
runs-on: ubuntu-latest
17+
# jobs:
18+
# aws-cli:
19+
# name: AWScli Role
20+
# runs-on: ubuntu-latest
2121

22-
strategy:
23-
matrix:
24-
distro:
25-
- centos8
26-
- debian10
22+
# strategy:
23+
# matrix:
24+
# distro:
25+
# - centos8
26+
# - debian10
2727

28-
steps:
29-
- name: Check out the codebase.
30-
uses: actions/checkout@v2
28+
# steps:
29+
# - name: Check out the codebase.
30+
# uses: actions/checkout@v2
3131

32-
- name: Set up Python 3.
33-
uses: actions/setup-python@v2
34-
with:
35-
python-version: '3.x'
32+
# - name: Set up Python 3.
33+
# uses: actions/setup-python@v2
34+
# with:
35+
# python-version: '3.x'
3636

37-
- name: Install test dependencies.
38-
run: pip3 install molecule docker yamllint ansible ansible-lint 'molecule[docker]'
37+
# - name: Install test dependencies.
38+
# run: pip3 install molecule docker yamllint ansible ansible-lint 'molecule[docker]'
3939

40-
- name: Run Molecule tests ansible role
41-
run: cd _tools/ansible/roles/aws-cli && molecule test
42-
env:
43-
PY_COLORS: '1'
44-
ANSIBLE_FORCE_COLOR: '1'
45-
MOLECULE_DISTRO: ${{ matrix.distro }}
40+
# - name: Run Molecule tests ansible role
41+
# run: cd _tools/ansible/roles/aws-cli && molecule test
42+
# env:
43+
# PY_COLORS: '1'
44+
# ANSIBLE_FORCE_COLOR: '1'
45+
# MOLECULE_DISTRO: ${{ matrix.distro }}
Lines changed: 42 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,46 @@
1-
name: Terraform Baseline
1+
# name: Terraform Baseline
22

3-
on:
4-
push:
5-
branches:
6-
- main
7-
paths:
8-
- '.github/**'
9-
- 'baseline/**'
10-
- '_tools/terraform/modules/**'
11-
pull_request:
12-
branches:
13-
- '*'
14-
paths:
15-
- '.github/**'
16-
- 'baseline/**'
17-
- '_tools/terraform/modules/**'
3+
# on:
4+
# push:
5+
# branches:
6+
# - main
7+
# paths:
8+
# - '.github/**'
9+
# - 'baseline/**'
10+
# - '_tools/terraform/modules/**'
11+
# pull_request:
12+
# branches:
13+
# - '*'
14+
# paths:
15+
# - '.github/**'
16+
# - 'baseline/**'
17+
# - '_tools/terraform/modules/**'
1818

19-
jobs:
19+
# jobs:
2020

21-
terraform-baseline:
22-
name: 'TF Baseline QA'
23-
runs-on: ubuntu-latest
24-
env:
25-
environment: qa
26-
region: eu-west-1
27-
steps:
28-
- name: Setup terraform provider
29-
uses: hashicorp/setup-terraform@v1
30-
with:
31-
terraform_version: 1.0.0
32-
cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
33-
- name: Checkout Source
34-
uses: actions/checkout@v2
21+
# terraform-baseline:
22+
# name: 'TF Baseline QA'
23+
# runs-on: ubuntu-latest
24+
# env:
25+
# environment: qa
26+
# region: eu-west-1
27+
# steps:
28+
# - name: Setup go-task
29+
# uses: pnorton5432/setup-task@v1
30+
# with:
31+
# task-version: 3.43.3
32+
# - name: Setup terraform provider
33+
# uses: hashicorp/setup-terraform@v3
34+
# with:
35+
# terraform_version: 1.11.4
36+
# cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
37+
# - name: Checkout Source
38+
# uses: actions/checkout@v4
3539

36-
- name: baseline-${{ env.environment }}-${{ env.region }}
37-
shell: bash
38-
run: |
39-
make init
40-
make validate
41-
make version
42-
make plan
43-
working-directory: ./baseline/${{ env.environment }}/${{ env.region }}
40+
# - name: baseline-${{ env.environment }}-${{ env.region }}
41+
# shell: bash
42+
# run: |
43+
# task tf:init
44+
# task tf:validate
45+
# task tf:plan
46+
# working-directory: ./baseline/${{ env.environment }}/${{ env.region }}
Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,46 @@
1-
# - https://help.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets
1+
# name: Terraform Build
22

3-
name: Terraform Build
3+
# on:
4+
# push:
5+
# branches:
6+
# - main
7+
# paths:
8+
# - '.github/**'
9+
# - 'build/**'
10+
# - '_tools/terraform/modules/**'
11+
# pull_request:
12+
# branches:
13+
# - '*'
14+
# paths:
15+
# - '.github/**'
16+
# - 'build/**'
17+
# - '_tools/terraform/modules/**'
418

5-
on:
6-
push:
7-
branches:
8-
- main
9-
paths:
10-
- '.github/**'
11-
- 'build/**'
12-
- '_tools/terraform/modules/**'
13-
pull_request:
14-
branches:
15-
- '*'
16-
paths:
17-
- '.github/**'
18-
- 'build/**'
19-
- '_tools/terraform/modules/**'
19+
# jobs:
2020

21-
jobs:
21+
# terraform-build:
22+
# name: 'TF Build QA'
23+
# runs-on: ubuntu-latest
24+
# env:
25+
# environment: qa
26+
# region: eu-west-1
27+
# steps:
28+
# - name: Setup go-task
29+
# uses: pnorton5432/setup-task@v1
30+
# with:
31+
# task-version: 3.43.3
32+
# - name: Setup terraform provider
33+
# uses: hashicorp/setup-terraform@v3
34+
# with:
35+
# terraform_version: 1.11.4
36+
# cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
37+
# - name: Checkout Source
38+
# uses: actions/checkout@v4
2239

23-
terraform-build:
24-
name: 'TF Build QA'
25-
runs-on: ubuntu-latest
26-
env:
27-
environment: qa
28-
region: eu-west-1
29-
steps:
30-
- name: Setup terraform provider
31-
uses: hashicorp/setup-terraform@v1
32-
with:
33-
terraform_version: 1.0.0
34-
cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
35-
- name: Checkout Source
36-
uses: actions/checkout@v2
37-
38-
- name: build-${{ env.environment }}-${{ env.region }}
39-
shell: bash
40-
run: |
41-
make init
42-
make validate
43-
make version
44-
make plan
45-
working-directory: ./build/${{ env.environment }}/${{ env.region }}
40+
# - name: build-${{ env.environment }}-${{ env.region }}
41+
# shell: bash
42+
# run: |
43+
# task tf:init
44+
# task tf:validate
45+
# task tf:plan
46+
# working-directory: ./build/${{ env.environment }}/${{ env.region }}
Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
name: Terraform MyApp
1+
# name: Terraform MyApp
22

3-
on:
4-
push:
5-
branches:
6-
- main
7-
paths:
8-
- '.github/**'
9-
- 'myapp/**'
10-
- '_tools/terraform/modules/**'
11-
pull_request:
12-
branches:
13-
- '*'
14-
paths:
15-
- '.github/**'
16-
- 'myapp/**'
17-
- '_tools/terraform/modules/**'
3+
# on:
4+
# push:
5+
# branches:
6+
# - main
7+
# paths:
8+
# - '.github/**'
9+
# - 'myapp/**'
10+
# - '_tools/terraform/modules/**'
11+
# pull_request:
12+
# branches:
13+
# - '*'
14+
# paths:
15+
# - '.github/**'
16+
# - 'myapp/**'
17+
# - '_tools/terraform/modules/**'
1818

19-
jobs:
19+
# jobs:
2020

21-
terraform-myapp:
22-
name: 'TF MyApp QA'
23-
runs-on: ubuntu-latest
24-
env:
25-
environment: qa
26-
region: eu-west-1
27-
steps:
28-
- name: Setup terraform provider
29-
uses: hashicorp/setup-terraform@v1
30-
with:
31-
terraform_version: 1.0.0
32-
cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
33-
- name: Checkout Source
34-
uses: actions/checkout@v2
21+
# terraform-myapp:
22+
# name: 'TF MyApp QA'
23+
# runs-on: ubuntu-latest
24+
# env:
25+
# environment: qa
26+
# region: eu-west-1
27+
# steps:
28+
# - name: Setup terraform provider
29+
# uses: hashicorp/setup-terraform@v1
30+
# with:
31+
# terraform_version: 1.0.0
32+
# cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
33+
# - name: Checkout Source
34+
# uses: actions/checkout@v2
3535

36-
- name: myapp-${{ env.environment }}-${{ env.region }}
37-
shell: bash
38-
run: |
39-
make init
40-
make validate
41-
make version
42-
make plan
43-
working-directory: ./myapp/${{ env.environment }}/${{ env.region }}
36+
# - name: myapp-${{ env.environment }}-${{ env.region }}
37+
# shell: bash
38+
# run: |
39+
# make init
40+
# make validate
41+
# make version
42+
# make plan
43+
# working-directory: ./myapp/${{ env.environment }}/${{ env.region }}

0 commit comments

Comments
 (0)