Skip to content

Commit

Permalink
[fix][chore] Rename Resoto -> Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
aquamatthias committed Feb 26, 2024
1 parent 111ed2a commit e2bd057
Show file tree
Hide file tree
Showing 774 changed files with 5,323 additions and 5,125 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN su vscode -c 'curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
&& su vscode -c '$HOME/.cargo/bin/cargo install --features=ssl websocat'

# Install infrequently changing requirements
COPY requirements-all.txt /tmp/resoto-requirements.txt
COPY requirements-all.txt /tmp/fix-requirements.txt
RUN su vscode -c 'pip3 install --no-warn-script-location -U pip wheel poetry' \
&& su vscode -c 'pip3 --disable-pip-version-check --no-cache-dir install --no-warn-script-location -U -r /tmp/resoto-requirements.txt' \
&& rm -rf /tmp/resoto-requirements.txt
&& su vscode -c 'pip3 --disable-pip-version-check --no-cache-dir install --no-warn-script-location -U -r /tmp/fix-requirements.txt' \
&& rm -rf /tmp/fix-requirements.txt
10 changes: 5 additions & 5 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/postgres
{
"name": "Resoto & ArangoDB",
"name": "Fix & ArangoDB",
"dockerComposeFile": "docker-compose.yml",
"service": "resoto",
"service": "fix",
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// This can be used to network with other containers or the host.
"forwardPorts": [
8529, // ArangoDB
8900 // Resoto
8900 // Fix
],
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "bash -ic .devcontainer/postCreate.sh",
"containerEnv": {
"RESOTOCORE_ANALYTICS_OPT_OUT": "True"
"FIXCORE_ANALYTICS_OPT_OUT": "True"
},
// Configure tool-specific properties.
"customizations": {
Expand Down Expand Up @@ -69,4 +69,4 @@
}
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
}
8 changes: 4 additions & 4 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
version: '3.8'

services:
resoto:
fix:
build:
context: ..
dockerfile: .devcontainer/Dockerfile

container_name: "devcontainer-resoto-${USER}"
container_name: "devcontainer-fix-${USER}"

volumes:
- ../..:/workspaces:cached
- devcontainer-resoto-bashhistory:/commandhistory
- devcontainer-fix-bashhistory:/commandhistory

# Overrides default command so things don't shut down after the process ends.
command: sleep infinity
Expand Down Expand Up @@ -39,7 +39,7 @@ services:

volumes:
# keep the bash history between container rebuilds
devcontainer-resoto-bashhistory:
devcontainer-fix-bashhistory:
# Uncomment this in case you want to keep arangodb data in a separate volume
# arangodb-data:
# arangodb-apps-data:
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ body:
id: version
attributes:
label: Version
description: What version of Resoto are you running?
description: What version of FixInventory are you running?
validations:
required: true
- type: input
Expand Down Expand Up @@ -52,4 +52,4 @@ body:
- type: markdown
attributes:
value: |
By submitting this bug report, I agree to follow the [code of conduct](https://resoto.com/code-of-conduct).
By submitting this bug report, I agree to follow the [code of conduct](https://inventory.fix.security/code-of-conduct).
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ contact_links:
url: https://discord.gg/someengineering
about: Chat with other users and the development team
- name: 📄 Documentation
url: https://resoto.com/docs
url: https://inventory.fix.security/docs
about: Read and search documentation
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ body:
- type: markdown
attributes:
value: |
By submitting this feature request, I agree to follow the [code of conduct](https://resoto.com/code-of-conduct).
By submitting this feature request, I agree to follow the [code of conduct](https://inventory.fix.security/code-of-conduct).
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

# Code of Conduct

By submitting this pull request, I agree to follow the [code of conduct](https://resoto.com/code-of-conduct).
By submitting this pull request, I agree to follow the [code of conduct](https://inventory.fix.security/code-of-conduct).
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Check PR (resotolib)
name: Check PR (fixlib)
on:
push:
tags:
Expand All @@ -7,13 +7,13 @@ on:
- main
pull_request:
paths:
- 'resotolib/**'
- 'fixlib/**'
- '.github/**'
- 'requirements-all.txt'

jobs:
resotolib:
name: "resotolib"
fixlib:
name: "fixlib"
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -29,7 +29,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{hashFiles('./resotolib/pyproject.toml')}}-${{hashFiles('./resotolib/requirements-all.txt')}}
key: ${{ runner.os }}-pip-${{hashFiles('./fixlib/pyproject.toml')}}-${{hashFiles('./fixlib/requirements-all.txt')}}
restore-keys: |
${{ runner.os }}-pip-
Expand All @@ -39,17 +39,17 @@ jobs:
pip install tox wheel flake8 build
- name: Run tests
working-directory: ./resotolib
working-directory: ./fixlib
run: tox

- name: Archive code coverage results
uses: actions/upload-artifact@v2
with:
name: resotolib-code-coverage-report
path: resotolib/htmlcov/
name: fixlib-code-coverage-report
path: fixlib/htmlcov/

- name: Build a binary wheel and a source tarball
working-directory: ./resotolib
working-directory: ./fixlib
run: >-
python -m
build
Expand All @@ -62,5 +62,5 @@ jobs:
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_RESOTOLIB }}
packages_dir: ./resotolib/dist/
password: ${{ secrets.PYPI_FIXLIB }}
packages_dir: ./fixlib/dist/
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Check PR (resotoworker)
name: Check PR (fixmetrics)
on:
push:
tags:
Expand All @@ -7,14 +7,14 @@ on:
- main
pull_request:
paths:
- 'resotoworker/**'
- 'resotolib/**'
- 'fixmetrics/**'
- 'fixlib/**'
- '.github/**'
- 'requirements-all.txt'

jobs:
resotoworker:
name: "resotoworker"
fixmetrics:
name: "fixmetrics"
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -30,28 +30,28 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{hashFiles('./resotoworker/pyproject.toml')}}
key: ${{ runner.os }}-pip-${{hashFiles('./fixmetrics/pyproject.toml')}}
restore-keys: |
${{ runner.os }}-pip-
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
pip install tox wheel flake8 build
pip install --upgrade --editable resotolib/
pip install --upgrade --editable fixlib/
- name: Run tests
working-directory: ./resotoworker
working-directory: ./fixmetrics
run: tox

- name: Archive code coverage results
uses: actions/upload-artifact@v2
with:
name: resotoworker-code-coverage-report
path: resotoworker/htmlcov/
name: fixmetrics-code-coverage-report
path: fixmetrics/htmlcov/

- name: Build a binary wheel and a source tarball
working-directory: ./resotoworker
working-directory: ./fixmetrics
run: >-
python -m
build
Expand All @@ -64,5 +64,5 @@ jobs:
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_RESOTOWORKER }}
packages_dir: ./resotoworker/dist/
password: ${{ secrets.PYPI_FIXMETRICS }}
packages_dir: ./fixmetrics/dist/
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Check PR (resotoshell)
name: Check PR (fixshell)
on:
push:
tags:
Expand All @@ -7,15 +7,15 @@ on:
- main
pull_request:
paths:
- 'resotoshell/**'
- 'resotolib/**'
- 'fixshell/**'
- 'fixlib/**'
- '.github/**'
- 'requirements-all.txt'
workflow_dispatch:

jobs:
resotoshell:
name: "resotoshell"
fixshell:
name: "fixshell"
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -31,28 +31,28 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{runner.os}}-pip-${{hashFiles('./resotoshell/pyproject.toml')}}
key: ${{runner.os}}-pip-${{hashFiles('./fixshell/pyproject.toml')}}
restore-keys: |
${{ runner.os }}-pip-
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
pip install tox wheel flake8 build
pip install --upgrade --editable resotolib/
pip install --upgrade --editable fixlib/
- name: Run tests
working-directory: ./resotoshell
working-directory: ./fixshell
run: tox

- name: Archive code coverage results
uses: actions/upload-artifact@v2
with:
name: resotoshell-code-coverage-report
path: resotoshell/htmlcov/
name: fixshell-code-coverage-report
path: fixshell/htmlcov/

- name: Build a binary wheel and a source tarball
working-directory: ./resotoshell
working-directory: ./fixshell
run: >-
python -m
build
Expand All @@ -65,5 +65,5 @@ jobs:
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_RESOTOSHELL }}
packages_dir: ./resotoshell/dist/
password: ${{ secrets.PYPI_FIXSHELL }}
packages_dir: ./fixshell/dist/
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Check PR (resotometrics)
name: Check PR (fixworker)
on:
push:
tags:
Expand All @@ -7,14 +7,14 @@ on:
- main
pull_request:
paths:
- 'resotometrics/**'
- 'resotolib/**'
- 'fixworker/**'
- 'fixlib/**'
- '.github/**'
- 'requirements-all.txt'

jobs:
resotometrics:
name: "resotometrics"
fixworker:
name: "fixworker"
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -30,28 +30,28 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{hashFiles('./resotometrics/pyproject.toml')}}
key: ${{ runner.os }}-pip-${{hashFiles('./fixworker/pyproject.toml')}}
restore-keys: |
${{ runner.os }}-pip-
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
pip install tox wheel flake8 build
pip install --upgrade --editable resotolib/
pip install --upgrade --editable fixlib/
- name: Run tests
working-directory: ./resotometrics
working-directory: ./fixworker
run: tox

- name: Archive code coverage results
uses: actions/upload-artifact@v2
with:
name: resotometrics-code-coverage-report
path: resotometrics/htmlcov/
name: fixworker-code-coverage-report
path: fixworker/htmlcov/

- name: Build a binary wheel and a source tarball
working-directory: ./resotometrics
working-directory: ./fixworker
run: >-
python -m
build
Expand All @@ -64,5 +64,5 @@ jobs:
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_RESOTOMETRICS }}
packages_dir: ./resotometrics/dist/
password: ${{ secrets.PYPI_FIXWORKER }}
packages_dir: ./fixworker/dist/
Loading

0 comments on commit e2bd057

Please sign in to comment.