Skip to content

Commit c78dbcd

Browse files
serdigital64serdigital64
authored
real: promote 1.0.2 (#3)
1 parent b60ec19 commit c78dbcd

Some content is hidden

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

86 files changed

+1171
-1781
lines changed

‎.dev.env‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#!/usr/bin/env bash
2+
#
3+
# Development environment variables
4+
#
5+
# * Used by DevBin64 to define project wide variables
6+
# * Automatically loaded by dev-set
7+
# * Do not include local variables (workstation specific) and secrets. Use .local.env and .secrets.env instead
8+
# * Version: 1.0.1
9+
# * Template: 5.0.0
10+
#
11+
12+
#
13+
# DevBin64 variables
14+
#
15+
# * Use to customize devbin64 module variables
16+
# * Module variables are defined in bin/dev-env-MODULE
17+
#
18+
19+
# Env / GIT / Upstream URL
20+
export DEV_GIT_REMOTE_UPSTREAM_URL='https://github.com/automation64/terraform-iac64-hello-world.git'
21+
22+
# Lint / TFLint / Target
23+
export DEV_LINT_TFLINT_TARGET="$DEV_BUILD_OPENTOFU_STAGING"
24+
25+
# SAST /TFSec / Target
26+
export DEV_SAST_TFSEC_TARGET="$DEV_BUILD_OPENTOFU_STAGING"
27+
28+
# Test / Act / List of workflows. Format: job-id, separated by spaces
29+
export DEV_TEST_ACT_WORKFLOWS='lint-opentofu lint-tflint sast-gitleaks sast-tfsec test-opentofu'
30+
31+
#
32+
# Project variables
33+
#

‎.devbin64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.0
1+
10.3.0

‎.devbin64-modules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
act
2-
bash
32
git
43
github
54
gitleaks
6-
iac64
75
opentofu
8-
testmansh
96
tflint
107
tfsec

‎.env‎

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎.github/workflows/lint_opentofu.yaml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
---
2+
# template: 1.0.0
3+
name: "Lint / OpenTofu"
4+
5+
env:
6+
DEV_CICD_DEBUG: ""
7+
BL64_LIB_CICD: "YES"
8+
9+
on:
10+
pull_request:
11+
branches:
12+
- "main"
13+
push:
14+
branches:
15+
- "feature/**"
16+
paths:
17+
- "src/**"
18+
19+
jobs:
20+
lint-opentofu:
21+
runs-on: "ubuntu-latest"
22+
steps:
23+
24+
- name: "Check out repository code"
25+
uses: "actions/checkout@main"
26+
27+
- name: "Cache local tools"
28+
uses: "actions/cache@v4"
29+
with:
30+
path: ./lib
31+
key: ${{ runner.os }}-lib-cache
32+
restore-keys: |
33+
${{ runner.os }}-lib-cache
34+
35+
- name: "Prepare environment"
36+
run: "./bin/dev-lib-base"
37+
38+
- name: "Download tools"
39+
run: "./bin/dev-lib-opentofu"
40+
41+
- name: "Prepare for testing"
42+
run: "./bin/dev-build-opentofu"
43+
44+
- name: "Run Linter"
45+
run: "./bin/dev-lint-opentofu"
46+
...

‎.github/workflows/lint_tflint.yaml‎

100644100755
Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
---
2-
# Template: 1.1.0
3-
name: "SAST / TFSec"
2+
# template: 1.1.1
3+
name: "Lint / TFLint"
44

55
env:
66
DEV_CICD_DEBUG: ""
77
BL64_LIB_CICD: "YES"
8-
DEV_TEST_BASH_RUNNER_ENVIRONMENT: "ON"
98

109
on:
1110
pull_request:
@@ -18,19 +17,32 @@ on:
1817
- "src/**"
1918

2019
jobs:
21-
sast:
20+
lint-tflint:
2221
runs-on: "ubuntu-latest"
2322
steps:
2423

2524
- name: "Check out repository code"
2625
uses: "actions/checkout@main"
2726

27+
- name: "Cache local tools"
28+
uses: "actions/cache@v4"
29+
with:
30+
path: ./lib
31+
key: ${{ runner.os }}-lib-cache
32+
restore-keys: |
33+
${{ runner.os }}-lib-cache
34+
2835
- name: "Prepare environment"
2936
run: "./bin/dev-lib-base"
3037

3138
- name: "Download tools"
32-
run: "./bin/dev-lib-tfsec"
39+
run: |
40+
./bin/dev-lib-opentofu
41+
./bin/dev-lib-tflint
42+
43+
- name: "Prepare for testing"
44+
run: "./bin/dev-build-opentofu"
3345

34-
- name: "Run SAST"
35-
run: "./bin/dev-sast-tfsec"
46+
- name: "Run Linter"
47+
run: "./bin/dev-lint-tflint"
3648
...

‎.github/workflows/sast_gitleaks.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Template: 1.1.0
2+
# template: 1.2.0
33
name: "SAST / GitLeaks"
44

55
env:
@@ -23,6 +23,14 @@ jobs:
2323
- name: "Check out repository code"
2424
uses: "actions/checkout@main"
2525

26+
- name: "Cache local tools"
27+
uses: "actions/cache@v4"
28+
with:
29+
path: ./lib
30+
key: ${{ runner.os }}-lib-cache
31+
restore-keys: |
32+
${{ runner.os }}-lib-cache
33+
2634
- name: "Prepare environment"
2735
run: "./bin/dev-lib-base"
2836

‎.github/workflows/sast_tfsec.yaml‎

100644100755
Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
# Template: 1.1.0
3-
name: "Lint / TFLint"
2+
# template: 1.1.1
3+
name: "SAST / TFSec"
44

55
env:
66
DEV_CICD_DEBUG: ""
@@ -18,19 +18,32 @@ on:
1818
- "src/**"
1919

2020
jobs:
21-
lint:
21+
sast-tfsec:
2222
runs-on: "ubuntu-latest"
2323
steps:
2424

2525
- name: "Check out repository code"
2626
uses: "actions/checkout@main"
2727

28+
- name: "Cache local tools"
29+
uses: "actions/cache@v4"
30+
with:
31+
path: ./lib
32+
key: ${{ runner.os }}-lib-cache
33+
restore-keys: |
34+
${{ runner.os }}-lib-cache
35+
2836
- name: "Prepare environment"
2937
run: "./bin/dev-lib-base"
3038

3139
- name: "Download tools"
32-
run: "./bin/dev-lib-tflint"
40+
run: |
41+
./bin/dev-lib-opentofu
42+
./bin/dev-lib-tfsec
43+
44+
- name: "Prepare for testing"
45+
run: "./bin/dev-build-opentofu"
3346

3447
- name: "Run Lint"
35-
run: "./bin/dev-lint-tflint"
48+
run: "./bin/dev-sast-tfsec"
3649
...

‎.github/workflows/test_opentofu.yaml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
# Template: 1.2.0
2+
# template: 1.0.0
33
name: "Test / OpenTofu"
44

55
env:
@@ -16,15 +16,24 @@ on:
1616
- "feature/**"
1717
paths:
1818
- "src/**"
19+
- "test/**"
1920

2021
jobs:
21-
test:
22+
test-opentofu:
2223
runs-on: "ubuntu-latest"
2324
steps:
2425

2526
- name: "Check out repository code"
2627
uses: "actions/checkout@main"
2728

29+
- name: "Cache local tools"
30+
uses: "actions/cache@v4"
31+
with:
32+
path: ./lib
33+
key: ${{ runner.os }}-lib-cache
34+
restore-keys: |
35+
${{ runner.os }}-lib-cache
36+
2837
- name: "Prepare environment"
2938
run: "./bin/dev-lib-base"
3039

@@ -34,6 +43,6 @@ jobs:
3443
- name: "Prepare Source"
3544
run: "./bin/dev-build-opentofu"
3645

37-
- name: "Run Test"
46+
- name: "Run tests"
3847
run: "./bin/dev-test-opentofu"
3948
...

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@
2323
# Project specific exclusions
2424
#
2525

26+
# OpenTofu / Staging
27+
var/opentofu/
28+
2629
# Keep placeholder for empty directories
2730
!/**/.gitkeep

0 commit comments

Comments
 (0)