Skip to content

Commit

Permalink
fix: do not use s3 URLs (#252)
Browse files Browse the repository at this point in the history
  • Loading branch information
@aquamatthias
aquamatthias authored Jan 6, 2025
1 parent 554e87d commit bae6a80
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 37 deletions.
22 changes: 9 additions & 13 deletions ...-to-guides/configuration/roll-out-aws-permissions-with-cloudformation/index.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ The source code can be found in the [`someengineering/fixinventory-cf` GitHub re

:::

:::note

If you prefer to deploy the StackSet yourself, the S3 URL of the template to create the `FixInventoryAccess` role is [https://fixinventorypublic.s3.amazonaws.com/cf/fixinventory-role.template](https://fixinventorypublic.s3.amazonaws.com/cf/fixinventory-role.template).

:::

## Prerequisites

This guide assumes that you have already [installed](../../../getting-started/install/index.mdx) Fix Inventory.
Expand All @@ -45,9 +39,11 @@ You also need an [AWS Organization](https://aws.amazon.com/organizations) that m

3. Click this button to open the **Quick create stack** page:

[<span class="button button--primary">Deploy StackSet</span>](https://console.aws.amazon.com/cloudformation/home#/stacks/create/review?templateURL=https://fixinventorypublic.s3.amazonaws.com/cf/fixinventory-stackset.template)
[<span class="button button--primary">Deploy Stack</span>](https://console.aws.amazon.com/cloudformation/home#/stacks/create)

4. Specify the template by selecting "Upload a template file" and upload the file. Press Next.

4. Enter a stack name (e.g., `FixInventoryAccess`) and configure the four parameters as follows:
5. Enter a stack name (e.g., `FixInventoryAccess`) and configure the four parameters as follows:

| Parameter | Description |
| --- | --- |
Expand All @@ -58,17 +54,17 @@ You also need an [AWS Organization](https://aws.amazon.com/organizations) that m

![Stack Configuration](./img/configure_the_stack.png)

5. Click **Next** on both this page and the next, then click **Create Stack**.
6. Click **Next** on both this page and the next, then click **Create Stack**.

The stack will take a few minutes to deploy.

![Stack Creating](./img/stack_creating.png)

6. In the menu to the left, click **StackSets**. You can see that the StackSet is being created on the **Self-managed** or **Service-managed** tab (depending on the option you chose).
7. In the menu to the left, click **StackSets**. You can see that the StackSet is being created on the **Self-managed** or **Service-managed** tab (depending on the option you chose).

![StackSet Creating](./img/stackset_creating.png)

7. After a few minutes, the StackSet will be created and begin deploying to all accounts in our organization. Reviewing the stacks in `us-east-1`, you should now see a new stack created by the StackSet:
8. After a few minutes, the StackSet will be created and begin deploying to all accounts in our organization. Reviewing the stacks in `us-east-1`, you should now see a new stack created by the StackSet:

![Stacks Created](./img/stacks_created.png)

Expand Down Expand Up @@ -97,8 +93,8 @@ You also need an [AWS Organization](https://aws.amazon.com/organizations) that m
aws cloudformation create-stack \
--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=FixInventoryAccountID,ParameterValue=$FIX_ACCOUNT_ID
--template-body file://path/to/your/fixinventory-role.template \
--parameters ParameterKey=DeploymentTargetOrganizationalUnitIds,ParameterValue="$AWS_OU" ParameterKey=FixInventoryAccountID,ParameterValue=$FIX_ACCOUNT_ID
```

:::info
Expand Down
6 changes: 0 additions & 6 deletions docs/how-to-guides/data-sources/collect-aws-resource-data.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,6 @@ You can specify a profile using `AWS_PROFILE` and, for local testing, SSO authen

See [How to Roll Out Fix Inventory AWS Permissions with CloudFormation](../configuration/roll-out-aws-permissions-with-cloudformation/index.mdx) for a step-by-step guide on how to roll out Fix Inventory [permissions](../../reference/iam-permissions/aws.mdx) organization-wide.

:::info

If you prefer to deploy the role yourself, the S3 URL of the template to create the `FixInventoryAccess` role is [https://fixinventorypublic.s3.amazonaws.com/cf/fixinventory-role.template](https://fixinventorypublic.s3.amazonaws.com/cf/fixinventory-role.template).

:::

### 4. Trigger Resource Collection

1. By default, Fix Inventory performs resource collection each hour. To immediately trigger a collect run, use the [`workflow run` command](../../reference/cli/workflow/run.mdx) in [Fix Inventory Shell](../../reference/components/shell):
Expand Down
20 changes: 8 additions & 12 deletions ...-to-guides/configuration/roll-out-aws-permissions-with-cloudformation/index.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ The source code can be found in the [`someengineering/fixinventory-cf` GitHub re

:::

:::note

If you prefer to deploy the StackSet yourself, the S3 URL of the template to create the `FixInventoryAccess` role is [https://fixinventorypublic.s3.amazonaws.com/cf/fixinventory-role.template](https://fixinventorypublic.s3.amazonaws.com/cf/fixinventory-role.template).

:::

## Prerequisites

This guide assumes that you have already [installed](../../../getting-started/install/index.mdx) Fix Inventory.
Expand All @@ -45,9 +39,11 @@ You also need an [AWS Organization](https://aws.amazon.com/organizations) that m

3. Click this button to open the **Quick create stack** page:

[<span class="button button--primary">Deploy StackSet</span>](https://console.aws.amazon.com/cloudformation/home#/stacks/create/review?templateURL=https://fixinventorypublic.s3.amazonaws.com/cf/fixinventory-stackset.template)
[<span class="button button--primary">Deploy Stack</span>](https://console.aws.amazon.com/cloudformation/home#/stacks/create)

4. Specify the template by selecting "Upload a template file" and upload the file. Press Next.

4. Enter a stack name (e.g., `FixInventoryAccess`) and configure the four parameters as follows:
5. Enter a stack name (e.g., `FixInventoryAccess`) and configure the four parameters as follows:

| Parameter | Description |
| --- | --- |
Expand All @@ -58,17 +54,17 @@ You also need an [AWS Organization](https://aws.amazon.com/organizations) that m

![Stack Configuration](./img/configure_the_stack.png)

5. Click **Next** on both this page and the next, then click **Create Stack**.
6. Click **Next** on both this page and the next, then click **Create Stack**.

The stack will take a few minutes to deploy.

![Stack Creating](./img/stack_creating.png)

6. In the menu to the left, click **StackSets**. You can see that the StackSet is being created on the **Self-managed** or **Service-managed** tab (depending on the option you chose).
7. In the menu to the left, click **StackSets**. You can see that the StackSet is being created on the **Self-managed** or **Service-managed** tab (depending on the option you chose).

![StackSet Creating](./img/stackset_creating.png)

7. After a few minutes, the StackSet will be created and begin deploying to all accounts in our organization. Reviewing the stacks in `us-east-1`, you should now see a new stack created by the StackSet:
8. After a few minutes, the StackSet will be created and begin deploying to all accounts in our organization. Reviewing the stacks in `us-east-1`, you should now see a new stack created by the StackSet:

![Stacks Created](./img/stacks_created.png)

Expand Down Expand Up @@ -97,7 +93,7 @@ You also need an [AWS Organization](https://aws.amazon.com/organizations) that m
aws cloudformation create-stack \
--region us-east-1 \
--stack-name FixInventoryAccess \
--template-url https://fixinventorypublic.s3.amazonaws.com/cf/fixinventory-stackset.template \
--template-body file://path/to/your/fixinventory-role.template \
--parameters ParameterKey=DeploymentTargetOrganizationalUnitIds,ParameterValue="$AWS_OU" ParameterKey=FixInventoryAccountID,ParameterValue=$FIX_ACCOUNT_ID
```

Expand Down
6 changes: 0 additions & 6 deletions ...ioned_docs/version-4.X/how-to-guides/data-sources/collect-aws-resource-data.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,6 @@ You can specify a profile using `AWS_PROFILE` and, for local testing, SSO authen

See [How to Roll Out Fix Inventory AWS Permissions with CloudFormation](../configuration/roll-out-aws-permissions-with-cloudformation/index.mdx) for a step-by-step guide on how to roll out Fix Inventory [permissions](../../reference/iam-permissions/aws.mdx) organization-wide.

:::info

If you prefer to deploy the role yourself, the S3 URL of the template to create the `FixInventoryAccess` role is [https://fixinventorypublic.s3.amazonaws.com/cf/fixinventory-role.template](https://fixinventorypublic.s3.amazonaws.com/cf/fixinventory-role.template).

:::

### 4. Trigger Resource Collection

1. By default, Fix Inventory performs resource collection each hour. To immediately trigger a collect run, use the [`workflow run` command](../../reference/cli/workflow/run.mdx) in [Fix Inventory Shell](../../reference/components/shell):
Expand Down

0 comments on commit bae6a80

Please sign in to comment.