Skip to content

Commit 22cbd2c

Browse files
authored
Merge branch 'main' into add-spinner
2 parents fafbfc9 + cea226d commit 22cbd2c

File tree

5 files changed

+93
-5
lines changed

5 files changed

+93
-5
lines changed

.github/workflows/codeql.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: "CodeQL Scanning"
2+
3+
on:
4+
push:
5+
branches: [ "main" ]
6+
pull_request:
7+
branches: [ "main" ]
8+
schedule:
9+
- cron: '00 08 * * 1'
10+
11+
jobs:
12+
analyze:
13+
name: Analyze (${{ matrix.language }})
14+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
15+
permissions:
16+
security-events: write
17+
packages: read
18+
19+
strategy:
20+
fail-fast: false
21+
matrix:
22+
include:
23+
- language: go
24+
build-mode: autobuild
25+
steps:
26+
- name: Checkout repository
27+
uses: actions/checkout@v4
28+
29+
- name: Initialize CodeQL
30+
uses: github/codeql-action/init@v3
31+
with:
32+
languages: ${{ matrix.language }}
33+
build-mode: ${{ matrix.build-mode }}
34+
35+
- if: matrix.build-mode == 'manual'
36+
shell: bash
37+
run: |
38+
echo 'If you are using a "manual" build mode for one or more of the' \
39+
'languages you are analyzing, replace this with the commands to build' \
40+
'your code, for example:'
41+
echo ' make bootstrap'
42+
echo ' make release'
43+
exit 1
44+
45+
- name: Perform CodeQL Analysis
46+
uses: github/codeql-action/analyze@v3
47+
with:
48+
category: "/language:${{matrix.language}}"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN <<EOF
2323
go build -v -o ./terramaid main.go
2424
EOF
2525

26-
FROM alpine:3.20.2
26+
FROM alpine:3.20.3
2727
COPY --from=builder /usr/src/terramaid/terraform /usr/local/bin/terraform
2828
COPY --from=builder /usr/src/terramaid/terramaid /usr/local/bin/terramaid
2929

README.md

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,35 @@ flowchart TD
6666
6767
## Installation
6868

69-
Homebrew installation:
69+
### Homebrew
7070

7171
```sh
7272
brew install terramaid
7373
```
7474

75-
If you have a functional go environment, you can install with:
75+
If you have a functional Go environment, you can install with:
7676

7777
```sh
7878
go install github.com/RoseSecurity/terramaid@latest
7979
```
8080

81-
Build from source:
81+
### Apt
82+
83+
To install packages, you can quickly setup the repository automatically:
84+
85+
```sh
86+
curl -1sLf \
87+
'https://dl.cloudsmith.io/public/rosesecurity/terramaid/setup.deb.sh' \
88+
| sudo -E bash
89+
```
90+
91+
Once the repository is configured, you can install with:
92+
93+
```sh
94+
apt install terramaid=<VERSION>
95+
```
96+
97+
### Source
8298

8399
```sh
84100
git clone git@github.com:RoseSecurity/terramaid.git
@@ -132,3 +148,23 @@ docker run -it -v $(pwd):/usr/src/terramaid rosesecurity/terramaid:latest
132148
## CI/CD Integrations
133149

134150
Terramaid is designed to easily integrate with existing pipelines and workflows. For more information on sample GitHub Actions and GitLab CI/CD Pipelines, feel free to check out [GitHub Actions Integrations](./docs/GitHub_Actions_Integration.md) and [Gitlab Pipelines Integrations](./docs/GitLab_Pipelines_Integration.md).
151+
152+
## Contributing
153+
154+
For bug reports & feature requests, please use the [issue tracker](https://github.com/rosesecurity/terramaid/issues).
155+
156+
PRs are welcome! We follow the typical "fork-and-pull" Git workflow.
157+
1. **Fork** the repo on GitHub
158+
2. **Clone** the project to your own machine
159+
3. **Commit** changes to your own branch
160+
4. **Push** your work back up to your fork
161+
5. Submit a **Pull Request** so that we can review your changes
162+
163+
> [!TIP]
164+
> Be sure to merge the latest changes from "upstream" before making a pull request!
165+
166+
### Many Thanks to Our Contributors
167+
168+
<a href="https://github.com/rosesecurity/terramaid/graphs/contributors">
169+
<img src="https://contrib.rocks/image?repo=rosesecurity/terramaid&max=24" />
170+
</a>

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/hashicorp/terraform-exec v0.21.0
1111
github.com/mattn/go-colorable v0.1.13
1212
github.com/spf13/cobra v1.8.1
13-
golang.org/x/text v0.17.0
13+
golang.org/x/text v0.19.0
1414
)
1515

1616
require (

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
8787
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
8888
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
8989
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
90+
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
91+
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
92+
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
93+
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
9094
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
9195
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
9296
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

0 commit comments

Comments
 (0)