Skip to content

Commit

Permalink
fix(tests): update test environments
Browse files Browse the repository at this point in the history
  • Loading branch information
spbsoluble committed Oct 17, 2024
1 parent 559cefe commit adbb9b8
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 15 deletions.
27 changes: 19 additions & 8 deletions .github/config/environments.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,26 @@ module "keyfactor_github_test_environment_ad_10_5_0" {
keyfactor_password = var.keyfactor_password_10_5_0
}

module "keyfactor_github_test_environment_11_5_0_kc" {
source = "git::ssh://[email protected]/Keyfactor/terraform-module-keyfactor-github-test-environment-kc.git?ref=main"
# module "keyfactor_github_test_environment_11_5_0_kc" {
# source = "git::ssh://[email protected]/Keyfactor/terraform-module-keyfactor-github-test-environment-kc.git?ref=main"
#
# gh_environment_name = "KFC_11_5_0_KC"
# gh_repo_name = data.github_repository.repo.name
# keyfactor_hostname = var.keyfactor_hostname_11_5_0_KC
# keyfactor_client_id = var.keyfactor_client_id_11_5_0
# keyfactor_client_secret = var.keyfactor_client_secret_11_5_0
# keyfactor_auth_hostname = var.keyfactor_auth_hostname_11_5_0_KC
# keyfactor_tls_skip_verify = true
# }

gh_environment_name = "KFC_11_5_0_KC"
module "keyfactor_github_test_environment_12_3_0_kc" {
source = "git::ssh://[email protected]/Keyfactor/terraform-module-keyfactor-github-test-environment-ad.git?ref=main"

gh_environment_name = "KFC_12_3_0_KC"
gh_repo_name = data.github_repository.repo.name
keyfactor_hostname = var.keyfactor_hostname_11_5_0_KC
keyfactor_client_id = var.keyfactor_client_id_11_5_0
keyfactor_client_secret = var.keyfactor_client_secret_11_5_0
keyfactor_auth_hostname = var.keyfactor_auth_hostname_11_5_0_KC
keyfactor_hostname = var.keyfactor_hostname_12_3_0_KC
keyfactor_auth_token_url = var.keyfactor_auth_token_url_12_3_0_KC
keyfactor_client_id = var.keyfactor_client_id_12_3_0
keyfactor_client_secret = var.keyfactor_client_secret_12_3_0
keyfactor_tls_skip_verify = true
}

10 changes: 5 additions & 5 deletions .github/config/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@ variable "keyfactor_password_10_5_0" {
type = string
}

variable "keyfactor_client_id_11_5_0" {
variable "keyfactor_client_id_12_3_0" {
description = "The client ID to authenticate with the Keyfactor instance using Keycloak client credentials"
type = string
}

variable "keyfactor_client_secret_11_5_0" {
variable "keyfactor_client_secret_12_3_0" {
description = "The client secret to authenticate with the Keyfactor instance using Keycloak client credentials"
type = string
}

variable "keyfactor_hostname_11_5_0_KC" {
variable "keyfactor_hostname_12_3_0_KC" {
description = "The hostname of the Keyfactor instance"
type = string
default = "int-oidc-lab.eastus2.cloudapp.azure.com"
}

variable "keyfactor_auth_hostname_11_5_0_KC" {
variable "keyfactor_auth_token_url_12_3_0_KC" {
description = "The hostname of the KeyCloak instance to authenticate to for a Keyfactor Command access token"
type = string
default = "int-oidc-lab.eastus2.cloudapp.azure.com"
default = "https://int-oidc-lab.eastus2.cloudapp.azure.com:8444/realms/Keyfactor/protocol/openid-connect/token"
}

6 changes: 4 additions & 2 deletions .github/workflows/go_tests.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
name: Go Test Workflow

on: [ push ]
on:
push:
workflow_dispatch:

jobs:
test:
name: Run tests
runs-on: ubuntu-latest
strategy:
matrix:
environment: [ "KFC_10_5_0", "KFC_11_5_0_KC"]
environment: [ "KFC_10_5_0", "KFC_12_3_0_KC"]
environment: ${{ matrix.environment }}
steps:
- name: Check out code
Expand Down

0 comments on commit adbb9b8

Please sign in to comment.