Rename infra/ to bin/ (#91)

* Rename infra/ to bin/

* Move local_dev.env in config/, since it's config

* Do not gitignore hidden useless .isort

* Lint YAML files only

* Update paths in secrets baseline

Author: leplatrem

.github/workflows/build-image.yaml

@@ -71,7 +71,7 @@ jobs:
             "$IMAGE_TAG" \
             "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY" \
             "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" > ./version.json
-          docker build --file infra/Dockerfile -t $GITHUB_REPOSITORY:$IMAGE_TAG .
+          docker build --file Dockerfile -t $GITHUB_REPOSITORY:$IMAGE_TAG .
           docker image tag $GITHUB_REPOSITORY:$IMAGE_TAG $GITHUB_REPOSITORY:latest
           docker push $GITHUB_REPOSITORY:$IMAGE_TAG
           docker push $GITHUB_REPOSITORY:latest

.github/workflows/lint.yaml

@@ -15,4 +15,4 @@ jobs:
           cache: "poetry"
       - name: Install dependencies
         run: poetry install
-      - run: infra/lint.sh
+      - run: bin/lint.sh

.github/workflows/test.yaml

@@ -16,4 +16,4 @@ jobs:
       - name: Install dependencies
         run: poetry install
       - name: Run tests
-        run: infra/test.sh
+        run: bin/test.sh

.gitignore

@@ -128,8 +128,5 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-# iSort - Pre-Commit
-.isort.cfg
-
 # Don't check in your own Env
-*local_dev.env
+/config/local_dev.env

.pre-commit-config.yaml

@@ -12,53 +12,53 @@ repos:
           '--indent', '4',
           '--no-sort-keys',
         ]
-        exclude: "infra/k8s/secret.json"
+        exclude: "bin/k8s/secret.json"
       - id: trailing-whitespace
   - repo: local
     hooks:
       - id: pylint
         name: pylint
-        entry: infra/lint.sh pylint
+        entry: bin/lint.sh pylint
         language: script
         types: [python]
   - repo: local
     hooks:
       - id: mypy
         name: mypy
-        entry: infra/lint.sh mypy
+        entry: bin/lint.sh mypy
         language: script
         types: [python]
   - repo: local
     hooks:
       - id: bandit
         name: bandit
-        entry: infra/lint.sh bandit
+        entry: bin/lint.sh bandit
         language: script
         types: [python]
   - repo: local
     hooks:
       - id: detect-secrets
         name: detect-secrets
-        entry: infra/lint.sh detect-secrets
+        entry: bin/lint.sh detect-secrets
         language: script
   - repo: local
     hooks:
       - id: isort
         name: isort
-        entry: infra/lint.sh isort
+        entry: bin/lint.sh isort
         language: script
         types: [python]
   - repo: local
     hooks:
       - id: black
         name: black
-        entry: infra/lint.sh black
+        entry: bin/lint.sh black
         language: script
         types: [python]
   - repo: local
     hooks:
       - id: yamllint
         name: yamllint
-        entry: infra/lint.sh yamllint
+        entry: bin/lint.sh yamllint
         language: script
         types: [yaml]

.secrets.baseline

@@ -109,17 +109,17 @@
         "line_number": 152
       }
     ],
-    "infra/config/local_dev.env": [
+    "config/local_dev.env": [
       {
         "type": "Secret Keyword",
-        "filename": "infra/config/local_dev.env",
+        "filename": "config/local_dev.env",
         "hashed_secret": "4b9a4ce92b6a01a4cd6ee1672d31c043f2ae79ab",
         "is_verified": false,
         "line_number": 5
       },
       {
         "type": "Secret Keyword",
-        "filename": "infra/config/local_dev.env",
+        "filename": "config/local_dev.env",
         "hashed_secret": "77ea6398f252999314d609a708842a49fc43e055",
         "is_verified": false,
         "line_number": 8

.yamllint

@@ -5,7 +5,7 @@ extends: default
 ignore: |
   src/
   tests/
-  infra/
+  bin/
   .github/
   docker-compose.yaml
   .pre-commit-config.yaml

Dockerfile

@@ -65,7 +65,7 @@ COPY --from=builder-base $POETRY_HOME $POETRY_HOME
 COPY --from=builder-base $PYSETUP_PATH $PYSETUP_PATH
 
 # Copying in our entrypoint
-COPY --chown=app:app ./infra/docker-entrypoint.sh /docker-entrypoint.sh
+COPY --chown=app:app ./bin/docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
 # venv already has runtime deps installed we get a quicker install
@@ -88,9 +88,9 @@ ENV FASTAPI_ENV=production \
     PROMETHEUS_MULTIPROC=1
 
 COPY --from=builder-base $VENV_PATH $VENV_PATH
-COPY ./infra/gunicorn_conf.py /gunicorn_conf.py
+COPY ./bin/gunicorn_conf.py /gunicorn_conf.py
 
-COPY ./infra/docker-entrypoint.sh /docker-entrypoint.sh
+COPY ./bin/docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
 COPY . /app

Makefile

@@ -31,12 +31,12 @@ build:
 
 .PHONY: format
 format:
-	infra/lint.sh black --fix
-	infra/lint.sh isort --fix
+	bin/lint.sh black --fix
+	bin/lint.sh isort --fix
 
 .PHONY: lint
 lint:
-	docker-compose run --rm web infra/lint.sh
+	docker-compose run --rm web bin/lint.sh
 
 .PHONY: shell
 shell:
@@ -48,7 +48,7 @@ start:
 
 .PHONY: test
 test:
-	docker-compose run --rm web infra/test.sh
+	docker-compose run --rm web bin/test.sh
 
 .PHONY: test-shell
 test-shell: