Skip to content

Commit

Permalink
Merge 1.1.2 to main
Browse files Browse the repository at this point in the history
- fix(management): Management jobs for `K8STLSSecret` and `K8SSecret` types handle ECC keys.
- fix(manifest): Update store-type definitions to include params `IncludeCertChain` and `SeparateChain`
- fix(docs): Update screenshots for `K8SCluster` and `K8SNS` store types custom fields.
  • Loading branch information
fiddlermikey authored Jul 25, 2024
1 parent 9935cd1 commit 3905130
Show file tree
Hide file tree
Showing 43 changed files with 2,290 additions and 1,174 deletions.
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# See GitHub's documentation for more information on this file:
# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: "gomod"
directory: "/"
schedule:
interval: "daily"
27 changes: 0 additions & 27 deletions .github/workflows/keyfactor-merge-store-types.yml

This file was deleted.

41 changes: 16 additions & 25 deletions .github/workflows/keyfactor-starter-workflow.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,19 @@
name: Starter Workflow
on: [workflow_dispatch, push, pull_request]
name: Keyfactor Bootstrap Workflow

jobs:
call-create-github-release-workflow:
uses: Keyfactor/actions/.github/workflows/github-release.yml@main

call-dotnet-build-and-release-workflow:
needs: [call-create-github-release-workflow]
uses: Keyfactor/actions/.github/workflows/dotnet-build-and-release.yml@main
with:
release_version: ${{ needs.call-create-github-release-workflow.outputs.release_version }}
release_url: ${{ needs.call-create-github-release-workflow.outputs.release_url }}
release_dir: kubernetes-orchestrator-extension\bin\Release
secrets:
token: ${{ secrets.PRIVATE_PACKAGE_ACCESS }}
on:
workflow_dispatch:
pull_request:
types: [opened, closed, synchronize, edited, reopened]
push:
create:
branches:
- 'release-*.*'

call-generate-readme-workflow:
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
uses: Keyfactor/actions/.github/workflows/generate-readme.yml@main
secrets:
token: ${{ secrets.APPROVE_README_PUSH }}

call-update-catalog-workflow:
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
uses: Keyfactor/actions/.github/workflows/update-catalog.yml@main
jobs:
call-starter-workflow:
uses: keyfactor/actions/.github/workflows/starter.yml@v2
secrets:
token: ${{ secrets.SDK_SYNC_PAT }}
token: ${{ secrets.V2BUILDTOKEN}}
APPROVE_README_PUSH: ${{ secrets.APPROVE_README_PUSH}}
gpg_key: ${{ secrets.KF_GPG_PRIVATE_KEY }}
gpg_pass: ${{ secrets.KF_GPG_PASSPHRASE }}
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 1.1.2

## Fixes
- fix(pam): Fixed issue with 'remote' PAM not being able to execute unless the input was empty, making 'remote' PAM impossible.

# 1.1.1

## Features
Expand Down
115 changes: 115 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
# Setting SHELL to bash allows bash commands to be executed by recipes.
# Options are set to exit when a recipe line exits non-zero or a piped command fails.
SHELL = /usr/bin/env bash -o pipefail
.SHELLFLAGS = -ec

.PHONY: all
all: build

# Required environemnt variables for the project
ENV_VARS := AZURE_TENANT_ID AZURE_CLIENT_SECRET AZURE_CLIENT_ID AZURE_APP_GATEWAY_RESOURCE_ID

##@ General

# The help target prints out all targets with their descriptions organized
# beneath their categories. The categories are represented by '##@' and the
# target descriptions by '##'. The awk commands is responsible for reading the
# entire set of makefiles included in this invocation, looking for lines of the
# file as xyz: ## something, and then pretty-format the target and help. Then,
# if there's a line with ##@ something, that gets pretty-printed as a category.
# More info on the usage of ANSI control characters for terminal formatting:
# https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_parameters
# More info on the awk command:
# http://linuxcommand.org/lc3_adv_awk.php

.PHONY: help
help: ## Display this help.
@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)

##@ Development

.PHONY: reset
reset: ## Reset the environment
@echo "Resetting..."
@rm -rf test.env
@rm -rf .env

.PHONY: setup
setup: ## Setup the environment for development
@if [ ! -f .test.env ]; then \
echo "Creating .test.env file..."; \
> .env; \
for var in $(ENV_VARS); do \
echo -n "Enter value for $$var: "; \
read value; \
echo "export $$var=$$value" >> .test.env; \
done; \
echo ".test.env file created with input values."; \
fi
@if [ ! -f .env ]; then \
echo "PROJECT_ROOT=$$(pwd)" >> .env; \
echo "Select a project to target:"; \
PS3="Enter your choice: "; \
select opt in $$(ls */*.csproj); do \
if [ -n "$$opt" ]; then \
echo "You have selected $$opt"; \
echo "PROJECT_FILE=$$opt" >> .env; \
break; \
else \
echo "Invalid selection. Please try again."; \
fi; \
done; \
echo "PROJECT_NAME=$$(basename $$(dirname $$(grep PROJECT_FILE .env | cut -d '=' -f 2)))" >> .env; \
fi

.PHONY: newtest
newtest: setup ## Create a new test project
@source .env; \
testProjectName="$$PROJECT_NAME".Tests; \
echo "Creating new xUnit project called $$testProjectName"; \
dotnet new xunit -o $$testProjectName; \
dotnet sln add $$testProjectName/$$testProjectName.csproj; \
dotnet add $$testProjectName reference $$PROJECT_FILE;

.PHONY: installpackage
installpackage: ## Install a package to the project
@source .env; \
echo "Select a project to install the package into"; \
PS3="Selection: "; \
select opt in $$(ls */*.csproj); do \
if [ -n "$$opt" ]; then \
echo "You have selected $$opt"; \
break; \
else \
echo "Invalid selection. Please try again."; \
fi; \
done; \
echo "Enter the package name to install: "; \
read packageName; \
echo "Installing $$packageName to $$opt"; \
dotnet add $$opt package $$packageName;

.PHONY: testall
testall: ## Run all tests.
@source .env; \
source .test.env; \
dotnet test

.PHONY: test
test: ## Run a single test.
@source .env; \
source .test.env; \
dotnet test --no-restore --list-tests | \
grep -A 1000 "The following Tests are available:" | \
awk 'NR>1' | \
cut -d ' ' -f 5- | \
sed 's/(.*//i' | \
sort | uniq | \
fzf | \
xargs -I {} dotnet test --filter {} --logger "console;verbosity=detailed"

##@ Build

.PHONY: build
build: ## Build the test project
dotnet build
Loading

0 comments on commit 3905130

Please sign in to comment.