Merge branch 'main' into lloesche/iamfix

Signed-off-by: Lukas Lösche <[email protected]>
someengineering · Feb 28, 2024 · c7fc241 · c7fc241
2 parents e68863a + 30d77ff
commit c7fc241
Show file tree

Hide file tree

Showing 774 changed files with 778 additions and 777 deletions.
diff --git a/docs/development/apps.mdx b/docs/development/apps.mdx
@@ -69,7 +69,7 @@ Using [`resotoappbundler`](https://github.com/someengineering/fixinventoryappbun
 
     The `--index-url` argument can be used to specify a custom app index URL.
 
-    By default, Fix Inventory uses the [official app index URL](https://cdn.some.engineering/resoto/app/index.json).
+    By default, Fix Inventory uses the [official app index URL](https://cdn.some.engineering/fixinventory/apps/index.json).
 
     For local development, the index URL can point to a local JSON file using `file://...`.
 

diff --git a/...-to-guides/configuration/roll-out-aws-permissions-with-cloudformation/index.mdx b/...-to-guides/configuration/roll-out-aws-permissions-with-cloudformation/index.mdx
@@ -98,7 +98,7 @@ You also need an [AWS Organization](https://aws.amazon.com/organizations) that m
      --region us-east-1 \
      --stack-name FixInventoryAccess \
      --template-url https://fixinventorypublic.s3.amazonaws.com/cf/fixinventory-stackset.template \
-     --parameters ParameterKey=DeploymentTargetOrganizationalUnitIds,ParameterValue="$AWS_OU" ParameterKey=FixAccountID,ParameterValue=$FIXINVENTORY_ACCOUNT_ID
+     --parameters ParameterKey=DeploymentTargetOrganizationalUnitIds,ParameterValue="$AWS_OU" ParameterKey=FixInventoryAccountID,ParameterValue=$FIX_ACCOUNT_ID
    ```
 
    :::info

diff --git a/docs/how-to-guides/data-sources/collect-aws-resource-data.mdx b/docs/how-to-guides/data-sources/collect-aws-resource-data.mdx
@@ -284,7 +284,7 @@ See [How to Roll Out Fix Inventory AWS Permissions with CloudFormation](../confi
 
 :::info
 
-If you prefer to deploy the role yourself, the S3 URL of the template to create the `FixAccess` role is [https://resotopublic.s3.amazonaws.com/cf/resoto-role.template](https://resotopublic.s3.amazonaws.com/cf/resoto-role.template).
+If you prefer to deploy the role yourself, the S3 URL of the template to create the `FixInventoryAccess` role is [https://resotopublic.s3.amazonaws.com/cf/fixinventory-role.template](https://resotopublic.s3.amazonaws.com/cf/fixinventory-role.template).
 
 :::
 

diff --git a/docs/reference/cli/app/install.mdx b/docs/reference/cli/app/install.mdx
@@ -15,9 +15,9 @@ apps install <app_name> [--index-url <index_url>]
 
 ### Options
 
-| Option                    | Description                                                            |
-| ------------------------- | ---------------------------------------------------------------------- |
-| `--index-url <index_url>` | Index URL (e.g., `https://cdn.some.engineering/resoto/app/index.json`) |
+| Option                    | Description                                                                   |
+| ------------------------- | ----------------------------------------------------------------------------- |
+| `--index-url <index_url>` | Index URL (e.g., `https://cdn.some.engineering/fixinventory/apps/index.json`) |
 
 ### Parameters
 

diff --git a/docusaurus.config.ts b/docusaurus.config.ts
@@ -24,6 +24,7 @@ const config: Config = {
   onBrokenLinks: 'throw',
   onBrokenMarkdownLinks: 'throw',
   onBrokenAnchors: 'throw',
+  onDuplicateRoutes: 'throw',
   favicon: 'img/favicon.ico',
   trailingSlash: false,
   noIndex: !isProd,

diff --git a/static/_redirects b/static/_redirects
@@ -6,7 +6,7 @@ https://origin.inventory.fix.security/*                       https://inventory.
 
 /js/script.js                                                 https://plausible.io/js/script.js 200
 /api/event                                                    https://plausible.io/api/event 200
-/apps/index.json                                              https://cdn.some.engineering/resoto/apps/index.json 200
+/apps/index.json                                              https://cdn.some.engineering/fixinventory/apps/index.json 200
 
 /docs/*                                                       /:splat
 

diff --git a/static/img/kroki/005a246c3e497ba742a98c229a274642.svg b/static/img/kroki/005a246c3e497ba742a98c229a274642.svg
diff --git a/static/img/kroki/00ae22ec95ec8a9861a0d0cb807f1942.svg b/static/img/kroki/00ae22ec95ec8a9861a0d0cb807f1942.svg
diff --git a/static/img/kroki/00dab57ed1d673daf2cabc2c580aeb2c.svg b/static/img/kroki/00dab57ed1d673daf2cabc2c580aeb2c.svg
diff --git a/static/img/kroki/01c5fd508e5f32ee02e89b3e5ff4c3a3.svg b/static/img/kroki/01c5fd508e5f32ee02e89b3e5ff4c3a3.svg
diff --git a/static/img/kroki/020ce377d46e99dff2289db06768b922.svg b/static/img/kroki/020ce377d46e99dff2289db06768b922.svg
-Original file line number
+Diff line change
@@ Expand Up @@
     :::info
-    If you prefer to deploy the role yourself, the S3 URL of the template to create the `FixAccess` role is [https://resotopublic.s3.amazonaws.com/cf/resoto-role.template](https://resotopublic.s3.amazonaws.com/cf/resoto-role.template).
+    If you prefer to deploy the role yourself, the S3 URL of the template to create the `FixInventoryAccess` role is [https://resotopublic.s3.amazonaws.com/cf/fixinventory-role.template](https://resotopublic.s3.amazonaws.com/cf/fixinventory-role.template).
     :::
@@ Expand Down @@