From 8e3cf4c194f7a52cbb83efd7366f000500892695 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 16:44:45 +0000 Subject: [PATCH 1/4] Bump the python group in /tests with 3 updates Bumps the python group in /tests with 3 updates: [pytest](https://github.com/pytest-dev/pytest), [pytest-logger](https://github.com/aurzenligl/pytest-logger) and [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra). Updates `pytest` from 6.2.5 to 8.3.4 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/6.2.5...8.3.4) Updates `pytest-logger` from 0.5.1 to 1.1.1 - [Changelog](https://github.com/aurzenligl/pytest-logger/blob/master/CHANGELOG) - [Commits](https://github.com/aurzenligl/pytest-logger/compare/0.5.1...1.1.1) Updates `pytest-testinfra` from 6.5.0 to 10.1.1 - [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases) - [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest-testinfra/compare/6.5.0...10.1.1) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-major dependency-group: python - dependency-name: pytest-logger dependency-type: direct:production update-type: version-update:semver-major dependency-group: python - dependency-name: pytest-testinfra dependency-type: direct:production update-type: version-update:semver-major dependency-group: python ... Signed-off-by: dependabot[bot] --- tests/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index c81426fc..adb176ff 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,4 +1,4 @@ distro==1.9.0 -pytest==6.2.5 -pytest-logger==0.5.1 -pytest-testinfra==6.5.0 +pytest==8.3.4 +pytest-logger==1.1.1 +pytest-testinfra==10.1.1 From c790e19bbad2bf6cc27286ec709777ba48bb4212 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Tue, 7 Jan 2025 14:44:06 -0800 Subject: [PATCH 2/4] Pins test requirements for python 3.6 --- tests/requirements.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index adb176ff..07138ee6 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,4 +1,7 @@ distro==1.9.0 -pytest==8.3.4 -pytest-logger==1.1.1 -pytest-testinfra==10.1.1 +pytest==7.0.1;python_version<="3.6" +pytest==8.3.4;python_version>="3.7" +pytest-logger==1.0.0;python_version<="3.6" +pytest-logger==1.1.1;python_version>="3.7" +pytest-testinfra==6.8.0;python_version<="3.6" +pytest-testinfra==10.1.1;python_version>="3.7" From 2cb53b371379d6235ece8aa6492c4122d96aace8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 16:24:56 +0000 Subject: [PATCH 3/4] Bump plus3it/tardigrade-ci from 0.25.3 to 0.26.0 Bumps plus3it/tardigrade-ci from 0.25.3 to 0.26.0. --- updated-dependencies: - dependency-name: plus3it/tardigrade-ci dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 778f8a94..98cdd22b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1 @@ -FROM plus3it/tardigrade-ci:0.25.3 +FROM plus3it/tardigrade-ci:0.26.0 From 2c4a2b0999e4c7a26e10eacac9f2f8fbe6ef8fb5 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Tue, 7 Jan 2025 14:45:09 -0800 Subject: [PATCH 4/4] Updates readmes for latest terraform-docs --- spel/README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/spel/README.md b/spel/README.md index 2619bfad..b14fc577 100644 --- a/spel/README.md +++ b/spel/README.md @@ -7,27 +7,27 @@ | [spel\_version](#input\_spel\_version) | Version appended to the name of the built images | `string` | n/a | yes | | [amigen8\_bootdev\_mult](#input\_amigen8\_bootdev\_mult) | Factor by which to increase /boot's size on "special" distros (like OL8) | `string` | `"1.2"` | no | | [amigen8\_bootdev\_size](#input\_amigen8\_bootdev\_size) | Size, in MiB, to make the /boot partition (this will be multiplied by the 'amigen8\_bootdev\_mult' value for Oracle Linux images) | `string` | `"1024"` | no | -| [amigen8\_extra\_rpms](#input\_amigen8\_extra\_rpms) | List of package specs (rpm names or URLs to .rpm files) to install to the EL8 builders and images | `list(string)` | 
[
  "python39",
  "python39-pip",
  "python39-setuptools",
  "crypto-policies-scripts",
  "spel-release",
  "spel-dod-certs",
  "spel-wcf-certs",
  "amazon-ec2-net-utils",
  "ec2-hibinit-agent",
  "ec2-instance-connect",
  "ec2-instance-connect-selinux",
  "ec2-utils",
  "https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm"
]
| no | +| [amigen8\_extra\_rpms](#input\_amigen8\_extra\_rpms) | List of package specs (rpm names or URLs to .rpm files) to install to the EL8 builders and images | `list(string)` | 
[
  "python39",
  "python39-pip",
  "python39-setuptools",
  "crypto-policies-scripts",
  "spel-release",
  "spel-dod-certs",
  "spel-wcf-certs",
  "amazon-ec2-net-utils",
  "ec2-hibinit-agent",
  "ec2-instance-connect",
  "ec2-instance-connect-selinux",
  "ec2-utils",
  "https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm"
]
| no | | [amigen8\_filesystem\_label](#input\_amigen8\_filesystem\_label) | Label for the root filesystem when creating bare partitions for EL8 images | `string` | `""` | no | -| [amigen8\_package\_groups](#input\_amigen8\_package\_groups) | List of yum repo groups to install into EL8 images | `list(string)` | 
[
  "core"
]
| no | +| [amigen8\_package\_groups](#input\_amigen8\_package\_groups) | List of yum repo groups to install into EL8 images | `list(string)` | 
[
  "core"
]
| no | | [amigen8\_package\_manifest](#input\_amigen8\_package\_manifest) | File containing a list of RPMs to use as the build manifest for EL8 images | `string` | `""` | no | -| [amigen8\_repo\_names](#input\_amigen8\_repo\_names) | List of yum repo names to enable in the EL8 builders and EL8 images | `list(string)` | 
[
  "spel"
]
| no | -| [amigen8\_repo\_sources](#input\_amigen8\_repo\_sources) | List of yum package refs (names or urls to .rpm files) that install yum repo definitions in EL8 builders and images | `list(string)` | 
[
  "https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm",
  "https://spel-packages.cloudarmor.io/spel-packages/repo/spel-release-latest-8.noarch.rpm"
]
| no | +| [amigen8\_repo\_names](#input\_amigen8\_repo\_names) | List of yum repo names to enable in the EL8 builders and EL8 images | `list(string)` | 
[
  "spel"
]
| no | +| [amigen8\_repo\_sources](#input\_amigen8\_repo\_sources) | List of yum package refs (names or urls to .rpm files) that install yum repo definitions in EL8 builders and images | `list(string)` | 
[
  "https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm",
  "https://spel-packages.cloudarmor.io/spel-packages/repo/spel-release-latest-8.noarch.rpm"
]
| no | | [amigen8\_source\_branch](#input\_amigen8\_source\_branch) | Branch that will be checked out when cloning AMIgen8 | `string` | `"master"` | no | | [amigen8\_source\_url](#input\_amigen8\_source\_url) | URL that will be used to clone AMIgen8 | `string` | `"https://github.com/plus3it/AMIgen8.git"` | no | -| [amigen8\_storage\_layout](#input\_amigen8\_storage\_layout) | List of colon-separated tuples (mount:name:size) that describe the desired partitions for LVM-partitioned disks on EL8 images | `list(string)` | 
[
  "/:rootVol:6",
  "swap:swapVol:2",
  "/home:homeVol:1",
  "/var:varVol:2",
  "/var/tmp:varTmpVol:2",
  "/var/log:logVol:2",
  "/var/log/audit:auditVol:100%FREE"
]
| no | +| [amigen8\_storage\_layout](#input\_amigen8\_storage\_layout) | List of colon-separated tuples (mount:name:size) that describe the desired partitions for LVM-partitioned disks on EL8 images | `list(string)` | 
[
  "/:rootVol:6",
  "swap:swapVol:2",
  "/home:homeVol:1",
  "/var:varVol:2",
  "/var/tmp:varTmpVol:2",
  "/var/log:logVol:2",
  "/var/log/audit:auditVol:100%FREE"
]
| no | | [amigen9\_boot\_dev\_label](#input\_amigen9\_boot\_dev\_label) | Filesystem-label to apply to the '/boot' partition | `string` | `"boot_disk"` | no | | [amigen9\_boot\_dev\_size](#input\_amigen9\_boot\_dev\_size) | Size of the partition hosting the '/boot' partition | `number` | `768` | no | | [amigen9\_boot\_dev\_size\_mult](#input\_amigen9\_boot\_dev\_size\_mult) | Factor by which to increase /boot's size on "special" distros (like OL9) | `number` | `"1.1"` | no | -| [amigen9\_extra\_rpms](#input\_amigen9\_extra\_rpms) | List of package specs (rpm names or URLs to .rpm files) to install to the EL9 builders and images | `list(string)` | 
[
  "crypto-policies-scripts",
  "spel-release",
  "spel-dod-certs",
  "spel-wcf-certs",
  "amazon-ec2-net-utils",
  "ec2-hibinit-agent",
  "ec2-utils",
  "https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm"
]
| no | +| [amigen9\_extra\_rpms](#input\_amigen9\_extra\_rpms) | List of package specs (rpm names or URLs to .rpm files) to install to the EL9 builders and images | `list(string)` | 
[
  "crypto-policies-scripts",
  "spel-release",
  "spel-dod-certs",
  "spel-wcf-certs",
  "amazon-ec2-net-utils",
  "ec2-hibinit-agent",
  "ec2-utils",
  "https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm"
]
| no | | [amigen9\_filesystem\_label](#input\_amigen9\_filesystem\_label) | Label for the root filesystem when creating bare partitions for EL9 images | `string` | `""` | no | -| [amigen9\_package\_groups](#input\_amigen9\_package\_groups) | List of yum repo groups to install into EL9 images | `list(string)` | 
[
  "core"
]
| no | +| [amigen9\_package\_groups](#input\_amigen9\_package\_groups) | List of yum repo groups to install into EL9 images | `list(string)` | 
[
  "core"
]
| no | | [amigen9\_package\_manifest](#input\_amigen9\_package\_manifest) | File containing a list of RPMs to use as the build manifest for EL9 images | `string` | `""` | no | -| [amigen9\_repo\_names](#input\_amigen9\_repo\_names) | List of yum repo names to enable in the EL9 builders and EL9 images | `list(string)` | 
[
  "epel",
  "spel"
]
| no | -| [amigen9\_repo\_sources](#input\_amigen9\_repo\_sources) | List of yum package refs (names or urls to .rpm files) that install yum repo definitions in EL9 builders and images | `list(string)` | 
[
  "https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm",
  "https://spel-packages.cloudarmor.io/spel-packages/repo/spel-release-latest-9.noarch.rpm"
]
| no | +| [amigen9\_repo\_names](#input\_amigen9\_repo\_names) | List of yum repo names to enable in the EL9 builders and EL9 images | `list(string)` | 
[
  "epel",
  "spel"
]
| no | +| [amigen9\_repo\_sources](#input\_amigen9\_repo\_sources) | List of yum package refs (names or urls to .rpm files) that install yum repo definitions in EL9 builders and images | `list(string)` | 
[
  "https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm",
  "https://spel-packages.cloudarmor.io/spel-packages/repo/spel-release-latest-9.noarch.rpm"
]
| no | | [amigen9\_source\_branch](#input\_amigen9\_source\_branch) | Branch that will be checked out when cloning AMIgen9 | `string` | `"main"` | no | | [amigen9\_source\_url](#input\_amigen9\_source\_url) | URL that will be used to clone AMIgen9 | `string` | `"https://github.com/plus3it/AMIgen9.git"` | no | -| [amigen9\_storage\_layout](#input\_amigen9\_storage\_layout) | List of colon-separated tuples (mount:name:size) that describe the desired partitions for LVM-partitioned disks on EL9 images | `list(string)` | 
[
  "/:rootVol:6",
  "swap:swapVol:2",
  "/home:homeVol:1",
  "/var:varVol:2",
  "/var/tmp:varTmpVol:2",
  "/var/log:logVol:2",
  "/var/log/audit:auditVol:100%FREE"
]
| no | +| [amigen9\_storage\_layout](#input\_amigen9\_storage\_layout) | List of colon-separated tuples (mount:name:size) that describe the desired partitions for LVM-partitioned disks on EL9 images | `list(string)` | 
[
  "/:rootVol:6",
  "swap:swapVol:2",
  "/home:homeVol:1",
  "/var:varVol:2",
  "/var/tmp:varTmpVol:2",
  "/var/log:logVol:2",
  "/var/log/audit:auditVol:100%FREE"
]
| no | | [amigen9\_uefi\_dev\_label](#input\_amigen9\_uefi\_dev\_label) | Filesystem-label to apply to the '/boot/efi' partition | `string` | `"UEFI_DISK"` | no | | [amigen9\_uefi\_dev\_size](#input\_amigen9\_uefi\_dev\_size) | Size of the partition hosting the '/boot/efi' partition | `number` | `128` | no | | [amigen\_amiutils\_source\_url](#input\_amigen\_amiutils\_source\_url) | URL of the AMI Utils repo to be cloned using git, containing AWS utility rpms that will be installed to the AMIs | `string` | `""` | no | @@ -43,14 +43,14 @@ | [aws\_force\_deregister](#input\_aws\_force\_deregister) | Force deregister an existing AMI if one with the same name already exists | `bool` | `false` | no | | [aws\_instance\_type](#input\_aws\_instance\_type) | EC2 instance type to use while building the AMIs | `string` | `"t3.2xlarge"` | no | | [aws\_region](#input\_aws\_region) | Name of the AWS region in which to launch the EC2 instance to create the AMIs | `string` | `"us-east-1"` | no | -| [aws\_source\_ami\_filter\_centos9stream\_hvm](#input\_aws\_source\_ami\_filter\_centos9stream\_hvm) | Object with source AMI filters for CentOS Stream 9 HVM builds | 
object({
    name   = string
    owners = list(string)
  })
| 
{
  "name": "CentOS Stream 9 x86_64 *,spel-bootstrap-centos-9stream-*.x86_64-gp*",
  "owners": [
    "125523088429",
    "174003430611",
    "216406534498"
  ]
}
| no | -| [aws\_source\_ami\_filter\_ol8\_hvm](#input\_aws\_source\_ami\_filter\_ol8\_hvm) | Object with source AMI filters for Oracle Linux 8 HVM builds | 
object({
    name   = string
    owners = list(string)
  })
| 
{
  "name": "OL8.*-x86_64-HVM-*,spel-bootstrap-oraclelinux-8-hvm-*.x86_64-gp*,spel-bootstrap-ol-8-*.x86_64-gp*",
  "owners": [
    "131827586825",
    "174003430611",
    "216406534498"
  ]
}
| no | -| [aws\_source\_ami\_filter\_ol9\_hvm](#input\_aws\_source\_ami\_filter\_ol9\_hvm) | Object with source AMI filters for Oracle Linux 9 HVM builds | 
object({
    name   = string
    owners = list(string)
  })
| 
{
  "name": "OL9.*-x86_64-HVM-*,spel-bootstrap-oraclelinux-9-hvm-*.x86_64-gp*,spel-bootstrap-ol-9-*.x86_64-gp*",
  "owners": [
    "131827586825",
    "174003430611",
    "216406534498"
  ]
}
| no | -| [aws\_source\_ami\_filter\_rhel8\_hvm](#input\_aws\_source\_ami\_filter\_rhel8\_hvm) | Object with source AMI filters for RHEL 8 HVM builds | 
object({
    name   = string
    owners = list(string)
  })
| 
{
  "name": "RHEL-8.*_HVM-*-x86_64-*-Hourly*-GP*,spel-bootstrap-rhel-8-*.x86_64-gp*",
  "owners": [
    "309956199498",
    "219670896067",
    "174003430611",
    "216406534498"
  ]
}
| no | -| [aws\_source\_ami\_filter\_rhel9\_hvm](#input\_aws\_source\_ami\_filter\_rhel9\_hvm) | Object with source AMI filters for RHEL 9 HVM builds | 
object({
    name   = string
    owners = list(string)
  })
| 
{
  "name": "RHEL-9.*_HVM-*-x86_64-*-Hourly*-GP*,spel-bootstrap-rhel-9-*.x86_64-gp*",
  "owners": [
    "309956199498",
    "219670896067",
    "174003430611",
    "216406534498"
  ]
}
| no | +| [aws\_source\_ami\_filter\_centos9stream\_hvm](#input\_aws\_source\_ami\_filter\_centos9stream\_hvm) | Object with source AMI filters for CentOS Stream 9 HVM builds | 
object({
    name   = string
    owners = list(string)
  })
| 
{
  "name": "CentOS Stream 9 x86_64 *,spel-bootstrap-centos-9stream-*.x86_64-gp*",
  "owners": [
    "125523088429",
    "174003430611",
    "216406534498"
  ]
}
| no | +| [aws\_source\_ami\_filter\_ol8\_hvm](#input\_aws\_source\_ami\_filter\_ol8\_hvm) | Object with source AMI filters for Oracle Linux 8 HVM builds | 
object({
    name   = string
    owners = list(string)
  })
| 
{
  "name": "OL8.*-x86_64-HVM-*,spel-bootstrap-oraclelinux-8-hvm-*.x86_64-gp*,spel-bootstrap-ol-8-*.x86_64-gp*",
  "owners": [
    "131827586825",
    "174003430611",
    "216406534498"
  ]
}
| no | +| [aws\_source\_ami\_filter\_ol9\_hvm](#input\_aws\_source\_ami\_filter\_ol9\_hvm) | Object with source AMI filters for Oracle Linux 9 HVM builds | 
object({
    name   = string
    owners = list(string)
  })
| 
{
  "name": "OL9.*-x86_64-HVM-*,spel-bootstrap-oraclelinux-9-hvm-*.x86_64-gp*,spel-bootstrap-ol-9-*.x86_64-gp*",
  "owners": [
    "131827586825",
    "174003430611",
    "216406534498"
  ]
}
| no | +| [aws\_source\_ami\_filter\_rhel8\_hvm](#input\_aws\_source\_ami\_filter\_rhel8\_hvm) | Object with source AMI filters for RHEL 8 HVM builds | 
object({
    name   = string
    owners = list(string)
  })
| 
{
  "name": "RHEL-8.*_HVM-*-x86_64-*-Hourly*-GP*,spel-bootstrap-rhel-8-*.x86_64-gp*",
  "owners": [
    "309956199498",
    "219670896067",
    "174003430611",
    "216406534498"
  ]
}
| no | +| [aws\_source\_ami\_filter\_rhel9\_hvm](#input\_aws\_source\_ami\_filter\_rhel9\_hvm) | Object with source AMI filters for RHEL 9 HVM builds | 
object({
    name   = string
    owners = list(string)
  })
| 
{
  "name": "RHEL-9.*_HVM-*-x86_64-*-Hourly*-GP*,spel-bootstrap-rhel-9-*.x86_64-gp*",
  "owners": [
    "309956199498",
    "219670896067",
    "174003430611",
    "216406534498"
  ]
}
| no | | [aws\_ssh\_interface](#input\_aws\_ssh\_interface) | Specifies method used to select the value for the host in the SSH connection | `string` | `"public_dns"` | no | | [aws\_subnet\_id](#input\_aws\_subnet\_id) | ID of the subnet where Packer will launch the EC2 instance. Required if using an non-default VPC | `string` | `null` | no | -| [aws\_temporary\_security\_group\_source\_cidrs](#input\_aws\_temporary\_security\_group\_source\_cidrs) | List of IPv4 CIDR blocks to be authorized access to the instance | `list(string)` | 
[
  "0.0.0.0/0"
]
| no | +| [aws\_temporary\_security\_group\_source\_cidrs](#input\_aws\_temporary\_security\_group\_source\_cidrs) | List of IPv4 CIDR blocks to be authorized access to the instance | `list(string)` | 
[
  "0.0.0.0/0"
]
| no | | [azure\_build\_resource\_group\_name](#input\_azure\_build\_resource\_group\_name) | Existing resource group in which the build will run | `string` | `null` | no | | [azure\_client\_id](#input\_azure\_client\_id) | Application ID of the AAD Service Principal. Requires either client\_secret, client\_cert\_path or client\_jwt to be set as well | `string` | `null` | no | | [azure\_client\_secret](#input\_azure\_client\_secret) | Password/secret registered for the AAD Service Principal | `string` | `null` | no |