Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

distribute windows server 2022 to csr environments #580

Merged
merged 2 commits into from
Sep 20, 2023
Merged

distribute windows server 2022 to csr environments #580

merged 2 commits into from
Sep 20, 2023

Conversation

robertsweetman
Copy link
Contributor

  • need access to a reliable test instance for debugging other issues

@robertsweetman robertsweetman requested review from a team as code owners September 20, 2023 11:29
@github-actions

This comment has been minimized.

Sign in to view
drobinson-moj
drobinson-moj requested changes Sep 20, 2023
View reviewed changes
Copy link
Contributor

@drobinson-moj drobinson-moj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to increment version

@github-actions
Copy link
Contributor

teams/hmpps/windows_server_2022 terragrunt plan on pull_request event #50

module.imagebuilder.data.terraform_remote_state.imagebuilder_mp: Reading...
module.imagebuilder.data.terraform_remote_state.core_shared_services_production: Reading...
module.imagebuilder.data.aws_secretsmanager_secret.environment_management: Reading...
module.imagebuilder.data.terraform_remote_state.imagebuilder_mp: Read complete after 2s
module.imagebuilder.data.aws_secretsmanager_secret.environment_management: Read complete after 0s [id=<REDACTED>]
module.imagebuilder.data.aws_secretsmanager_secret_version.environment_management: Reading...
module.imagebuilder.data.terraform_remote_state.core_shared_services_production: Read complete after 2s
module.imagebuilder.data.aws_secretsmanager_secret_version.environment_management: Read complete after 0s [id=<REDACTED>]
module.imagebuilder.data.aws_imagebuilder_component.this["amazon-cloudwatch-agent-windows"]: Reading...
module.imagebuilder.data.aws_imagebuilder_component.this["ec2launch-v2-windows"]: Reading...
module.imagebuilder.data.aws_caller_identity.current: Reading...
module.imagebuilder.data.aws_caller_identity.current: Read complete after 0s [id=<REDACTED>]
module.imagebuilder.data.aws_kms_key.hmpps_ebs_encryption_cmk: Reading...
module.imagebuilder.data.aws_kms_key.hmpps_ebs_encryption_cmk: Read complete after 1s [id=<REDACTED>]
module.imagebuilder.data.aws_imagebuilder_component.this["ec2launch-v2-windows"]: Read complete after 1s [id=<REDACTED>]
module.imagebuilder.data.aws_imagebuilder_component.this["amazon-cloudwatch-agent-windows"]: Read complete after 1s [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_infrastructure_configuration.this: Refreshing state... [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_image_recipe.this: Refreshing state... [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_distribution_configuration.this: Refreshing state... [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_image_pipeline.this: Refreshing state... [id=<REDACTED>]

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
  ~ update in-place
-/+ destroy and then create replacement
+/- create replacement and then destroy

Terraform will perform the following actions:

  # module.imagebuilder.aws_imagebuilder_distribution_configuration.this will be updated in-place
  ~ resource "aws_imagebuilder_distribution_configuration" "this" {
        id           = "arn:aws:imagebuilder:eu-west-2:374269020027:distribution-configuration/hmpps-windows-server-2022"
        name         = "hmpps_windows_server_2022"
      ~ tags         = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
      ~ tags_all     = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
        # (4 unchanged attributes hidden)

      ~ distribution {
          # At least one attribute in this block is (or was) sensitive,
          # so its contents will not be displayed.
        }
    }

  # module.imagebuilder.aws_imagebuilder_image_pipeline.this must be replaced
-/+ resource "aws_imagebuilder_image_pipeline" "this" {
      ~ arn                              = "arn:aws:imagebuilder:eu-west-2:374269020027:image-pipeline/hmpps-windows-server-2022" -> (known after apply)
      ~ date_created                     = "2023-09-01T09:43:03.728Z" -> (known after apply)
      ~ date_last_run                    = "2023-09-02T00:00:45.811Z" -> (known after apply)
      ~ date_next_run                    = "2023-10-02T00:00:00.000Z" -> (known after apply)
      ~ date_updated                     = "2023-09-01T09:43:03.728Z" -> (known after apply)
      ~ id                               = "arn:aws:imagebuilder:eu-west-2:374269020027:image-pipeline/hmpps-windows-server-2022" -> (known after apply)
      ~ image_recipe_arn                 = "arn:aws:imagebuilder:eu-west-2:374269020027:image-recipe/hmpps-windows-server-2022/0.0.4" -> (known after apply) # forces replacement
      ~ infrastructure_configuration_arn = "arn:aws:imagebuilder:eu-west-2:374269020027:infrastructure-configuration/hmpps-windows-server-2022-0-0-4" -> (known after apply)
        name                             = "hmpps_windows_server_2022"
      ~ platform                         = "Windows" -> (known after apply)
      ~ tags                             = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
      ~ tags_all                         = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
        # (4 unchanged attributes hidden)

      + image_scanning_configuration {
          + image_scanning_enabled = (known after apply)

          + ecr_configuration {
              + container_tags  = (known after apply)
              + repository_name = (known after apply)
            }
        }

      ~ schedule {
          + timezone                           = (known after apply)
            # (2 unchanged attributes hidden)
        }

        # (1 unchanged block hidden)
    }

  # module.imagebuilder.aws_imagebuilder_image_recipe.this must be replaced
+/- resource "aws_imagebuilder_image_recipe" "this" {
      ~ arn               = "arn:aws:imagebuilder:eu-west-2:374269020027:image-recipe/hmpps-windows-server-2022/0.0.4" -> (known after apply)
      ~ date_created      = "2023-09-01T09:43:02.575Z" -> (known after apply)
      ~ id                = "arn:aws:imagebuilder:eu-west-2:374269020027:image-recipe/hmpps-windows-server-2022/0.0.4" -> (known after apply)
        name              = "hmpps_windows_server_2022"
      ~ owner             = "374269020027" -> (known after apply)
      ~ platform          = "Windows" -> (known after apply)
      ~ tags              = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
      ~ tags_all          = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
      + user_data_base64  = (known after apply)
      ~ version           = "0.0.4" -> "0.0.5" # forces replacement
      - working_directory = "" -> null
        # (2 unchanged attributes hidden)

      - block_device_mapping {
          - device_name = "/dev/sda1" -> null
          - no_device   = false -> null

          - ebs {
              - delete_on_termination = "true" -> null
              - encrypted             = "true" -> null
              - iops                  = 0 -> null
              - kms_key_id            = "arn:aws:kms:eu-west-2:374269020027:key/12984197-3371-4c21-8e43-a88a1581e691" -> null
              - throughput            = 0 -> null
              - volume_size           = 30 -> null
              - volume_type           = "gp3" -> null
            }
        }
      + block_device_mapping {
          + device_name = "/dev/sda1"

          + ebs {
              + delete_on_termination = "true"
              + encrypted             = "true"
              + kms_key_id            = "arn:aws:kms:eu-west-2:374269020027:key/12984197-3371-4c21-8e43-a88a1581e691"
              + volume_size           = 30
              + volume_type           = "gp3"
            }
        }

      + systems_manager_agent {
          + uninstall_after_build = (known after apply)
        }

        # (4 unchanged blocks hidden)
    }

  # module.imagebuilder.aws_imagebuilder_infrastructure_configuration.this must be replaced
-/+ resource "aws_imagebuilder_infrastructure_configuration" "this" {
      ~ arn                           = "arn:aws:imagebuilder:eu-west-2:374269020027:infrastructure-configuration/hmpps-windows-server-2022-0-0-4" -> (known after apply)
      ~ date_created                  = "2023-09-01T09:43:02.612Z" -> (known after apply)
      + date_updated                  = (known after apply)
      ~ id                            = "arn:aws:imagebuilder:eu-west-2:374269020027:infrastructure-configuration/hmpps-windows-server-2022-0-0-4" -> (known after apply)
      ~ name                          = "hmpps_windows_server_2022_0_0_4" -> "hmpps_windows_server_2022_0_0_5" # forces replacement
      ~ resource_tags                 = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
      ~ tags                          = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
      ~ tags_all                      = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
        # (6 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

Plan: 3 to add, 1 to change, 3 to destroy.

@robertsweetman robertsweetman merged commit 4060aa1 into main Sep 20, 2023
4 checks passed
@robertsweetman robertsweetman deleted the csr/make-known-good-ami--available-to-csr branch September 20, 2023 12:00
@github-actions
Copy link
Contributor

teams/hmpps/windows_server_2022 terragrunt plan on push event #51

module.imagebuilder.data.terraform_remote_state.imagebuilder_mp: Reading...
module.imagebuilder.data.terraform_remote_state.core_shared_services_production: Reading...
module.imagebuilder.data.terraform_remote_state.imagebuilder_mp: Read complete after 1s
module.imagebuilder.data.aws_secretsmanager_secret.environment_management: Reading...
module.imagebuilder.data.aws_secretsmanager_secret.environment_management: Read complete after 0s [id=<REDACTED>]
module.imagebuilder.data.aws_secretsmanager_secret_version.environment_management: Reading...
module.imagebuilder.data.aws_secretsmanager_secret_version.environment_management: Read complete after 1s [id=<REDACTED>]
module.imagebuilder.data.terraform_remote_state.core_shared_services_production: Read complete after 2s
module.imagebuilder.data.aws_imagebuilder_component.this["ec2launch-v2-windows"]: Reading...
module.imagebuilder.data.aws_imagebuilder_component.this["amazon-cloudwatch-agent-windows"]: Reading...
module.imagebuilder.data.aws_caller_identity.current: Reading...
module.imagebuilder.data.aws_caller_identity.current: Read complete after 0s [id=<REDACTED>]
module.imagebuilder.data.aws_kms_key.hmpps_ebs_encryption_cmk: Reading...
module.imagebuilder.data.aws_kms_key.hmpps_ebs_encryption_cmk: Read complete after 1s [id=<REDACTED>]
module.imagebuilder.data.aws_imagebuilder_component.this["amazon-cloudwatch-agent-windows"]: Read complete after 1s [id=<REDACTED>]
module.imagebuilder.data.aws_imagebuilder_component.this["ec2launch-v2-windows"]: Read complete after 2s [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_infrastructure_configuration.this: Refreshing state... [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_image_recipe.this: Refreshing state... [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_distribution_configuration.this: Refreshing state... [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_image_pipeline.this: Refreshing state... [id=<REDACTED>]

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
  ~ update in-place
-/+ destroy and then create replacement
+/- create replacement and then destroy

Terraform will perform the following actions:

  # module.imagebuilder.aws_imagebuilder_distribution_configuration.this will be updated in-place
  ~ resource "aws_imagebuilder_distribution_configuration" "this" {
        id           = "arn:aws:imagebuilder:eu-west-2:374269020027:distribution-configuration/hmpps-windows-server-2022"
        name         = "hmpps_windows_server_2022"
      ~ tags         = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
      ~ tags_all     = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
        # (4 unchanged attributes hidden)

      ~ distribution {
          # At least one attribute in this block is (or was) sensitive,
          # so its contents will not be displayed.
        }
    }

  # module.imagebuilder.aws_imagebuilder_image_pipeline.this must be replaced
-/+ resource "aws_imagebuilder_image_pipeline" "this" {
      ~ arn                              = "arn:aws:imagebuilder:eu-west-2:374269020027:image-pipeline/hmpps-windows-server-2022" -> (known after apply)
      ~ date_created                     = "2023-09-01T09:43:03.728Z" -> (known after apply)
      ~ date_last_run                    = "2023-09-02T00:00:45.811Z" -> (known after apply)
      ~ date_next_run                    = "2023-10-02T00:00:00.000Z" -> (known after apply)
      ~ date_updated                     = "2023-09-01T09:43:03.728Z" -> (known after apply)
      ~ id                               = "arn:aws:imagebuilder:eu-west-2:374269020027:image-pipeline/hmpps-windows-server-2022" -> (known after apply)
      ~ image_recipe_arn                 = "arn:aws:imagebuilder:eu-west-2:374269020027:image-recipe/hmpps-windows-server-2022/0.0.4" -> (known after apply) # forces replacement
      ~ infrastructure_configuration_arn = "arn:aws:imagebuilder:eu-west-2:374269020027:infrastructure-configuration/hmpps-windows-server-2022-0-0-4" -> (known after apply)
        name                             = "hmpps_windows_server_2022"
      ~ platform                         = "Windows" -> (known after apply)
      ~ tags                             = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
      ~ tags_all                         = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
        # (4 unchanged attributes hidden)

      + image_scanning_configuration {
          + image_scanning_enabled = (known after apply)

          + ecr_configuration {
              + container_tags  = (known after apply)
              + repository_name = (known after apply)
            }
        }

      ~ schedule {
          + timezone                           = (known after apply)
            # (2 unchanged attributes hidden)
        }

        # (1 unchanged block hidden)
    }

  # module.imagebuilder.aws_imagebuilder_image_recipe.this must be replaced
+/- resource "aws_imagebuilder_image_recipe" "this" {
      ~ arn               = "arn:aws:imagebuilder:eu-west-2:374269020027:image-recipe/hmpps-windows-server-2022/0.0.4" -> (known after apply)
      ~ date_created      = "2023-09-01T09:43:02.575Z" -> (known after apply)
      ~ id                = "arn:aws:imagebuilder:eu-west-2:374269020027:image-recipe/hmpps-windows-server-2022/0.0.4" -> (known after apply)
        name              = "hmpps_windows_server_2022"
      ~ owner             = "374269020027" -> (known after apply)
      ~ platform          = "Windows" -> (known after apply)
      ~ tags              = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
      ~ tags_all          = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
      + user_data_base64  = (known after apply)
      ~ version           = "0.0.4" -> "0.0.5" # forces replacement
      - working_directory = "" -> null
        # (2 unchanged attributes hidden)

      - block_device_mapping {
          - device_name = "/dev/sda1" -> null
          - no_device   = false -> null

          - ebs {
              - delete_on_termination = "true" -> null
              - encrypted             = "true" -> null
              - iops                  = 0 -> null
              - kms_key_id            = "arn:aws:kms:eu-west-2:374269020027:key/12984197-3371-4c21-8e43-a88a1581e691" -> null
              - throughput            = 0 -> null
              - volume_size           = 30 -> null
              - volume_type           = "gp3" -> null
            }
        }
      + block_device_mapping {
          + device_name = "/dev/sda1"

          + ebs {
              + delete_on_termination = "true"
              + encrypted             = "true"
              + kms_key_id            = "arn:aws:kms:eu-west-2:374269020027:key/12984197-3371-4c21-8e43-a88a1581e691"
              + volume_size           = 30
              + volume_type           = "gp3"
            }
        }

      + systems_manager_agent {
          + uninstall_after_build = (known after apply)
        }

        # (4 unchanged blocks hidden)
    }

  # module.imagebuilder.aws_imagebuilder_infrastructure_configuration.this must be replaced
-/+ resource "aws_imagebuilder_infrastructure_configuration" "this" {
      ~ arn                           = "arn:aws:imagebuilder:eu-west-2:374269020027:infrastructure-configuration/hmpps-windows-server-2022-0-0-4" -> (known after apply)
      ~ date_created                  = "2023-09-01T09:43:02.612Z" -> (known after apply)
      + date_updated                  = (known after apply)
      ~ id                            = "arn:aws:imagebuilder:eu-west-2:374269020027:infrastructure-configuration/hmpps-windows-server-2022-0-0-4" -> (known after apply)
      ~ name                          = "hmpps_windows_server_2022_0_0_4" -> "hmpps_windows_server_2022_0_0_5" # forces replacement
      ~ resource_tags                 = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
      ~ tags                          = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
      ~ tags_all                      = {
          ~ "image-recipe"                            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
          ~ "infrastructure-configuration"            = "hmpps_windows_server_2022/0.0.4" -> "hmpps_windows_server_2022/0.0.5"
            # (11 unchanged elements hidden)
        }
        # (6 unchanged attributes hidden)

        # (1 unchanged block hidden)
    }

Plan: 3 to add, 1 to change, 3 to destroy.

@github-actions
Copy link
Contributor

teams/hmpps/windows_server_2022 terraform apply on push event #51

module.imagebuilder.aws_imagebuilder_image_pipeline.this: Destroying... [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_image_pipeline.this: Destruction complete after 1s
module.imagebuilder.aws_imagebuilder_infrastructure_configuration.this: Destroying... [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_image_recipe.this: Creating...
module.imagebuilder.aws_imagebuilder_distribution_configuration.this: Modifying... [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_infrastructure_configuration.this: Destruction complete after 0s
module.imagebuilder.aws_imagebuilder_infrastructure_configuration.this: Creating...
module.imagebuilder.aws_imagebuilder_distribution_configuration.this: Modifications complete after 0s [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_infrastructure_configuration.this: Creation complete after 1s [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_image_recipe.this: Creation complete after 1s [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_image_pipeline.this: Creating...
module.imagebuilder.aws_imagebuilder_image_pipeline.this: Creation complete after 1s [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_image_recipe.this (deposed object a8d2360d): Destroying... [id=<REDACTED>]
module.imagebuilder.aws_imagebuilder_image_recipe.this: Destruction complete after 1s

Apply complete! Resources: 3 added, 1 changed, 3 destroyed.

Outputs:

parent_ami = {}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drobinson-moj drobinson-moj drobinson-moj approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@robertsweetman @drobinson-moj