Skip to content

Commit

Permalink
Rename project to KICS (Checkmarx#334)
Browse files Browse the repository at this point in the history
* renaming ice to kics (Checkmarx#2)

* Complete renaming process (Checkmarx#3)

* remove ast dependencies (Checkmarx#4)

* remove ast dependencies (Checkmarx#4)

* fixed lint issue

Co-authored-by: Rui Gomes <[email protected]>
  • Loading branch information
kaplanlior and ruigomescx authored Nov 23, 2020
1 parent 9593b69 commit da689e8
Show file tree
Hide file tree
Showing 31 changed files with 102 additions and 633 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ COPY . .


# Build the Go app
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -installsuffix cgo -o bin/ice cmd/ice/main.go cmd/ice/config.go
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -installsuffix cgo -o bin/kics cmd/kics/main.go cmd/kics/config.go

#runtime image
FROM alpine:3.11.3

RUN apk add --no-cache git

COPY --from=build_env /app/bin/ice /app/bin/ice
COPY --from=build_env /app/bin/kics /app/bin/kics
COPY --from=build_env /app/assets /app/assets

# Command to run the executable
ENTRYPOINT ["/app/bin/ice"]
ENTRYPOINT ["/app/bin/kics"]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ test: dep # Run unit tests

.PHONY: dockerise
dockerise:
docker build --build-arg GIT_USER=$(GITHUB_USER) --build-arg GIT_TOKEN=$(GITHUB_TOKEN) -t "ice:${IMAGE_TAG}" .
docker build --build-arg GIT_USER=$(GITHUB_USER) --build-arg GIT_TOKEN=$(GITHUB_TOKEN) -t "kics:${IMAGE_TAG}" .

.PHONY: mock
mock:
Expand Down
4 changes: 2 additions & 2 deletions cmd/builder/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"path"

"github.com/checkmarxDev/ice/pkg/builder/engine"
"github.com/checkmarxDev/ice/pkg/builder/writer"
"github.com/Checkmarx/kics/pkg/builder/engine"
"github.com/Checkmarx/kics/pkg/builder/writer"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
Expand Down
24 changes: 12 additions & 12 deletions cmd/console/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ import (
"io/ioutil"
"os"

"github.com/checkmarxDev/ice/internal/storage"
"github.com/checkmarxDev/ice/internal/tracker"
"github.com/checkmarxDev/ice/pkg/engine"
"github.com/checkmarxDev/ice/pkg/engine/query"
"github.com/checkmarxDev/ice/pkg/ice"
"github.com/checkmarxDev/ice/pkg/model"
"github.com/checkmarxDev/ice/pkg/parser"
jsonParser "github.com/checkmarxDev/ice/pkg/parser/json"
terraformParser "github.com/checkmarxDev/ice/pkg/parser/terraform"
yamlParser "github.com/checkmarxDev/ice/pkg/parser/yaml"
"github.com/checkmarxDev/ice/pkg/source"
"github.com/Checkmarx/kics/internal/storage"
"github.com/Checkmarx/kics/internal/tracker"
"github.com/Checkmarx/kics/pkg/engine"
"github.com/Checkmarx/kics/pkg/engine/query"
"github.com/Checkmarx/kics/pkg/kics"
"github.com/Checkmarx/kics/pkg/model"
"github.com/Checkmarx/kics/pkg/parser"
jsonParser "github.com/Checkmarx/kics/pkg/parser/json"
terraformParser "github.com/Checkmarx/kics/pkg/parser/terraform"
yamlParser "github.com/Checkmarx/kics/pkg/parser/yaml"
"github.com/Checkmarx/kics/pkg/source"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -77,7 +77,7 @@ func main() { // nolint:funlen,gocyclo
Add(terraformParser.NewDefault()).
Build()

service := &ice.Service{
service := &kics.Service{
SourceProvider: filesSource,
Storage: store,
Parser: combinedParser,
Expand Down
6 changes: 3 additions & 3 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## Installation

This section describes installation procedure of ICE.
This section describes installation procedure of KICS.

To have a fully working environment to use and develop in ICE you will need:
To have a fully working environment to use and develop in KICS you will need:

1. Download and install Go: https://golang.org/dl/
2. Install VS Code (or another IDE of your choosing): https://code.visualstudio.com/Download
Expand All @@ -11,7 +11,7 @@ To have a fully working environment to use and develop in ICE you will need:
- Open Policy Agent
- Git Lens
4. Install PostgreSQL: https://www.postgresql.org/download/ (optional, not needed for CLI usage)
5. Clone the repository of ICE to VS Code: https://github.com/CheckmarxDev/ice
5. Clone the repository of KICS to VS Code: https://github.com/Checkmarx/kics
6. Test if the application is running properly by running in the terminal, in the root of the project:

go run ./cmd/console/main.go -p assets/queries/terraform
6 changes: 3 additions & 3 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ KICS is a true community project. It's built as an open source from day one, and
- [Take me to the repo on GitHub!](https://github.com/CheckmarxDev/ice/)

- [How can I help?!](contribution.md)
- [Take me to the repo on GitHub!](https://github.com/CheckmarxDev/ice/)
- [Take me to the repo on GitHub!](https://github.com/Checkmarx/kics/)

## About the Project

Expand All @@ -60,5 +60,5 @@ Now, Software <span style="color: #5FBB46">**=**</span> **Security**.
Looking for more info? Explore KICS project in details:

- [Roadmap](roadmap.md)
- [Project plans](https://github.com/CheckmarxDev/ice/projects)
- [Issues](https://github.com/CheckmarxDev/ice/issues)
- [Project plans](https://github.com/Checkmarx/kics/projects)
- [Issues](https://github.com/Checkmarx/kics/issues)
11 changes: 2 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
module github.com/checkmarxDev/ice
module github.com/Checkmarx/kics

go 1.15

require (
github.com/agnivade/levenshtein v1.1.0
github.com/checkmarxDev/repostore v1.0.3
github.com/checkmarxDev/scans v1.5.5
github.com/golang/mock v1.4.4
github.com/google/go-cmp v0.5.0 // indirect
github.com/google/uuid v1.1.2
github.com/gorilla/mux v1.8.0
github.com/hashicorp/hcl/v2 v2.7.0
github.com/jmoiron/sqlx v1.2.0
github.com/lib/pq v1.8.0
github.com/mailru/easyjson v0.7.6
github.com/open-policy-agent/opa v0.24.0
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.20.0
github.com/spf13/cobra v1.1.1
github.com/spf13/viper v1.7.1
github.com/stretchr/testify v1.6.1
github.com/zclconf/go-cty v1.7.0
google.golang.org/grpc v1.33.1
google.golang.org/protobuf v1.25.0
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
)
Loading

0 comments on commit da689e8

Please sign in to comment.