Devops 1367

.env

@@ -1,25 +1,25 @@
 
 # Client URLS
 AUTH_SERVICE_URL="https://ci.kbase.us/services/auth/api/V2/me"
-CATALOG_URL="https://kbase.us/services/catalog"
+AUTH_LEGACY_URL="https://ci.kbase.us/services/auth/api/legacy/KBase/Sessions/Login"
+CATALOG_URL="https://ci.kbase.us/services/catalog"
 
 # Service Wizard URLS
 EXTERNAL_SW_URL="https://ci.kbase.us/services/service_wizard"
 EXTERNAL_DS_URL="https://ci.kbase.us/dynamic_services"
-KBASE_ENDPOINT="https://ci.kbase.us/services"
+KBASE_SERVICES_ENDPOINT="https://ci.kbase.us/services"
+KBASE_ROOT_ENDPOINT="https://ci.kbase.us"
 ROOT_PATH="/"
 
 # SW Admin Stuff
 KBASE_ADMIN_ROLE="KBASE_ADMIN"
 CATALOG_ADMIN_ROLE="CATALOG_ADMIN"
-SERVICE_WIZARD_ROLE="SERVICE_WIZARD_ADMIN"
-CATALOG_ADMIN_TOKEN="62IYPZGS7O773DBLZZCSE542BP4C2E7G"
-
-
+SERVICE_WIZARD_ADMIN_ROLE="SERVICE_WIZARD_ADMIN"
+CATALOG_ADMIN_TOKEN="REDACTED"
 
 # Kubernetes configs
 KUBECONFIG="~/.kube/config"
-NAMESPACE="staging-dynamic-services"
+NAMESPACE="staging-dynamic-services" # Note this also creates a toleration V1Toleration(effect="NoSchedule", key=namespace, operator="Exists")
 USE_INCLUSTER_CONFIG="false"
-
-
+TAINT_TOLERATION_EXPRESSIONS=""
+# APP_AFFINITY_FILE="app-affinity.yaml" # path to files that force apps to run on specific nodes

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/codeql.yml

@@ -61,4 +61,4 @@ jobs:
       #     make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v2

.github/workflows/test.yml

@@ -32,18 +32,22 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install dependecies
+      - name: Install dependencies
         # tried VaultVulp/action-pipenv but pytest wasn't on the path post action
         shell: bash
         run: |
           pip install pipenv
           pipenv sync --system --dev
 
+      - name: Run pre-commit Hooks
+        shell: bash
+        run: pre-commit run --all-files
+
       - name: Run tests
         shell: bash
         run: PYTHONPATH=. pytest --cov=src --cov-report=xml test
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
-          fail_ci_if_error: true
+          fail_ci_if_error: true

.github/workflows/trivy.yaml

@@ -28,4 +28,4 @@ jobs:
       - name: Upload Trivy scan results to GitHub Security tab
         uses: github/codeql-action/upload-sarif@v2
         with:
-          sarif_file: 'trivy-results.sarif'
+          sarif_file: 'trivy-results.sarif'

.gitignore

@@ -1,6 +1,9 @@
+*Pipfile
+.env
 .coverage
 __pycache__
 .idea
 venv
 coverage.xml
 installed_clients/
+*.pytest-kind*

.pre-commit-config.yaml

@@ -0,0 +1,20 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.2.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+
+-   repo: https://github.com/psf/black
+    rev: 23.7.0
+    hooks:
+    -   id: black
+        language_version: python3.11
+
+-   repo: https://github.com/pycqa/flake8
+    rev: 6.1.0
+    hooks:
+    -   id: flake8
+        args: [--config, pyproject.toml]

Dockerfile

@@ -24,4 +24,3 @@ RUN echo $GIT_COMMIT
 
 
 ENTRYPOINT ["scripts/entrypoint.sh"]
-

LICENSE.md

@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

Pipfile

@@ -7,7 +7,6 @@ name = "pypi"
 fastapi = "==0.95.2"
 uvicorn = {version = "==0.22.0", extras = ["standard"]}
 sentry-sdk = "==1.25.0"
-#{version = "==23.5.2", extras = ["fastapi"]}
 PySocks = "==1.7.1"
 requests = "==2.31.0"
 prometheus-fastapi-instrumentator =  "==6.0.0"
@@ -18,11 +17,14 @@ python-dotenv = "==0.19.1"
 httpx = "==0.24.1"
 kubernetes = "==26.1.0"
 
-
 [dev-packages]
 pytest = "==7.3.1"
 pytest-cov = "==4.0.0"
 requests_mock = "==1.9.3"
+pre-commit = "==3.3.3"
+black = "==23.7.0"
+flake8 = "==6.1.0"
+pytest_kind = "==22.11.1"
 
 [requires]
 python_version = "3.11"