* feat(host): Add host plugin related schemas and tests This adds the schema files for host plugins, plugin based catalogs and plugin based sets. This also adds the protos and tests which utilize gorm to ensure the schemas enforce the constraints we expect. Along with this change was a migration which moved catalog names to the base type table so we can ensure all catalogs in a single scope, regardless of subtype, have a unique name. * Updated plugin schemas to do the following: - Add plugin_executable table - plugin table now also has scope_id and name w/ uniqueness constraints - host_plugin no longer has id_prefix column - host_plugin separates name and plugin_name - plugin_version table renamed version to symantic_version column. * Fix typo in delete_plugin_subtype trigger. Add update test for host plugins. * Update id prefixes. Fix public_id typos in protos and plugin_executable name in sql diagrams. * Created internal/plugin and moved base plugin structs to it and moved host plugin subdirectory to it. * Created internal/plugin and moved base plugin structs to it and moved host plugin subdirectory to it. * Add first pass at enums for OS and Arch supported by plugin executables. * Capitalizing the const enums for OS and Architectures. * Add comments to sql files. * Reviewer comments. Remove unsupported OSes and Archs from SQL and go constants. Add missing tests. * Be more permissive in the values the db accepts. The go logic can restrict which values it will allow getting populated into the db. * Removing constraints on which values can be placed inside operating_system and architecture columns. * Updating test helper functions to only create a single catalog or set. * Move files to new migration version. * Fixing job/plugin test. * Update table names, named a number of constraints, remove plugin version and executable tables. * Add constraints for plugin name and id prefix. * Rename constraint, remove unhelpful comment block. * Adding semantic version to plugin_host and set attributes to not null. * Remove semantic versioning from all locations. * Remove semantic_version from plugin_host table comment. * Fix op copy/paste error. Don't use deprecated errors methods. Update constraint names. Add docs. * Apply suggestions from code review Fixing constraint names. Co-authored-by: Michael Gaffney <mgaffney@users.noreply.github.com>
227 lines
8.5 KiB
Makefile
227 lines
8.5 KiB
Makefile
# Determine this makefile's path.
|
|
# Be sure to place this BEFORE `include` directives, if any.
|
|
THIS_FILE := $(lastword $(MAKEFILE_LIST))
|
|
THIS_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
|
|
|
|
TMP_DIR := $(shell mktemp -d)
|
|
REPO_PATH := github.com/hashicorp/boundary
|
|
|
|
GENERATED_CODE := $(shell find ${THIS_DIR} -name '*.gen.go' && find ${THIS_DIR} -name '*.pb.go' && find ${THIS_DIR} -name '*.pb.gw.go')
|
|
|
|
CGO_ENABLED?=0
|
|
|
|
export GEN_BASEPATH := $(shell pwd)
|
|
|
|
api:
|
|
$(MAKE) --environment-overrides -C internal/api/genapi api
|
|
|
|
cli:
|
|
$(MAKE) --environment-overrides -C internal/cmd/gencli cli
|
|
|
|
tools:
|
|
go generate -tags tools tools/tools.go
|
|
|
|
cleangen:
|
|
@rm -f ${GENERATED_CODE}
|
|
|
|
dev: BUILD_TAGS+=dev
|
|
dev: BUILD_TAGS+=ui
|
|
dev: build-ui-ifne
|
|
@echo "==> Building Boundary with dev and UI features enabled"
|
|
@CGO_ENABLED=$(CGO_ENABLED) BUILD_TAGS='$(BUILD_TAGS)' BOUNDARY_DEV_BUILD=1 sh -c "'$(CURDIR)/scripts/build.sh'"
|
|
|
|
bin: BUILD_TAGS+=ui
|
|
bin: build-ui
|
|
@echo "==> Building Boundary with UI features enabled"
|
|
@CGO_ENABLED=$(CGO_ENABLED) BUILD_TAGS='$(BUILD_TAGS)' sh -c "'$(CURDIR)/scripts/build.sh'"
|
|
|
|
fmt:
|
|
gofumpt -w $$(find . -name '*.go' | grep -v pb.go | grep -v pb.gw.go)
|
|
|
|
# Set env for all UI targets.
|
|
UI_TARGETS := update-ui-version build-ui build-ui-ifne
|
|
# Note the extra .tmp path segment in UI_CLONE_DIR is significant and required.
|
|
$(UI_TARGETS): export UI_CLONE_DIR := internal/ui/.tmp/boundary-ui
|
|
$(UI_TARGETS): export UI_VERSION_FILE := internal/ui/VERSION
|
|
$(UI_TARGETS): export UI_ASSETS_FILE := internal/ui/assets.go
|
|
$(UI_TARGETS): export UI_DEFAULT_BRANCH := main
|
|
$(UI_TARGETS): export UI_CURRENT_COMMIT := $(shell head -n1 < "$(UI_VERSION_FILE)" | cut -d' ' -f1)
|
|
$(UI_TARGETS): export UI_COMMITISH ?=
|
|
|
|
update-ui-version:
|
|
@if [ -z "$(UI_COMMITISH)" ]; then \
|
|
echo "==> Setting UI version to latest commit on branch '$(UI_DEFAULT_BRANCH)'"; \
|
|
export UI_COMMITISH="$(UI_DEFAULT_BRANCH)"; \
|
|
else \
|
|
echo "==> Setting to latest commit matching '$(UI_COMMITISH)'"; \
|
|
fi; \
|
|
./scripts/uiclone.sh && ./scripts/uiupdate.sh
|
|
|
|
build-ui:
|
|
@if [ -z "$(UI_COMMITISH)" ]; then \
|
|
echo "==> Building default UI version from $(UI_VERSION_FILE): $(UI_CURRENT_COMMIT)"; \
|
|
export UI_COMMITISH="$(UI_CURRENT_COMMIT)"; \
|
|
else \
|
|
echo "==> Building custom UI version $(UI_COMMITISH)"; \
|
|
fi; \
|
|
./scripts/uiclone.sh && ./scripts/uigen.sh
|
|
|
|
build-ui-ifne:
|
|
ifeq (,$(wildcard internal/ui/.tmp/boundary-ui))
|
|
@echo "==> No UI assets found, building..."
|
|
@$(MAKE) build-ui
|
|
else
|
|
@echo "==> UI assets found, use build-ui target to update"
|
|
endif
|
|
|
|
perms-table:
|
|
@go run internal/website/permstable/permstable.go
|
|
|
|
gen: cleangen proto api cli migrations perms-table fmt
|
|
|
|
migrations:
|
|
$(MAKE) --environment-overrides -C internal/db/schema/migrations/generate migrations
|
|
|
|
### oplog requires protoc-gen-go v1.20.0 or later
|
|
# GO111MODULE=on go get -u github.com/golang/protobuf/protoc-gen-go@v1.40
|
|
proto: protolint protobuild
|
|
|
|
protobuild:
|
|
# To add a new directory containing a proto pass the proto's root path in
|
|
# through the --proto_path flag.
|
|
@bash scripts/protoc_gen_plugin.bash \
|
|
"--proto_path=internal/proto/local" \
|
|
"--proto_include_path=internal/proto/third_party" \
|
|
"--plugin_name=go" \
|
|
"--plugin_out=${TMP_DIR}"
|
|
@bash scripts/protoc_gen_plugin.bash \
|
|
"--proto_path=internal/proto/local" \
|
|
"--proto_include_path=internal/proto/third_party" \
|
|
"--plugin_name=go-grpc" \
|
|
"--plugin_out=${TMP_DIR}"
|
|
@bash scripts/protoc_gen_plugin.bash \
|
|
"--proto_path=internal/proto/local/" \
|
|
"--proto_include_path=internal/proto/third_party" \
|
|
"--plugin_name=grpc-gateway" \
|
|
"--plugin_out=logtostderr=true:${TMP_DIR}"
|
|
|
|
# Move the generated files from the tmp file subdirectories into the current repo.
|
|
cp -R ${TMP_DIR}/${REPO_PATH}/* ${THIS_DIR}
|
|
|
|
@protoc --proto_path=internal/proto/local --proto_path=internal/proto/third_party --openapiv2_out=json_names_for_fields=false,logtostderr=true,disable_default_errors=true,include_package_in_tags=true,fqn_for_openapi_name=true,allow_merge,merge_file_name=controller:internal/gen/. internal/proto/local/controller/api/services/v1/*.proto
|
|
@protoc-go-inject-tag -input=./internal/oplog/store/oplog.pb.go
|
|
@protoc-go-inject-tag -input=./internal/oplog/oplog_test/oplog_test.pb.go
|
|
@protoc-go-inject-tag -input=./internal/iam/store/group_member.pb.go
|
|
@protoc-go-inject-tag -input=./internal/iam/store/role.pb.go
|
|
@protoc-go-inject-tag -input=./internal/iam/store/principal_role.pb.go
|
|
@protoc-go-inject-tag -input=./internal/iam/store/role_grant.pb.go
|
|
@protoc-go-inject-tag -input=./internal/iam/store/user.pb.go
|
|
@protoc-go-inject-tag -input=./internal/iam/store/scope.pb.go
|
|
@protoc-go-inject-tag -input=./internal/iam/store/group.pb.go
|
|
@protoc-go-inject-tag -input=./internal/db/db_test/db_test.pb.go
|
|
@protoc-go-inject-tag -input=./internal/host/store/host.pb.go
|
|
@protoc-go-inject-tag -input=./internal/host/static/store/static.pb.go
|
|
@protoc-go-inject-tag -input=./internal/host/plugin/store/host.pb.go
|
|
@protoc-go-inject-tag -input=./internal/plugin/host/store/plugin.pb.go
|
|
@protoc-go-inject-tag -input=./internal/plugin/store/plugin.pb.go
|
|
@protoc-go-inject-tag -input=./internal/authtoken/store/authtoken.pb.go
|
|
@protoc-go-inject-tag -input=./internal/auth/store/account.pb.go
|
|
@protoc-go-inject-tag -input=./internal/auth/password/store/password.pb.go
|
|
@protoc-go-inject-tag -input=./internal/auth/password/store/argon2.pb.go
|
|
@protoc-go-inject-tag -input=./internal/kms/store/root_key.pb.go
|
|
@protoc-go-inject-tag -input=./internal/kms/store/database_key.pb.go
|
|
@protoc-go-inject-tag -input=./internal/kms/store/oplog_key.pb.go
|
|
@protoc-go-inject-tag -input=./internal/kms/store/token_key.pb.go
|
|
@protoc-go-inject-tag -input=./internal/kms/store/session_key.pb.go
|
|
@protoc-go-inject-tag -input=./internal/kms/store/oidc_key.pb.go
|
|
@protoc-go-inject-tag -input=./internal/target/store/target.pb.go
|
|
@protoc-go-inject-tag -input=./internal/auth/oidc/store/oidc.pb.go
|
|
@protoc-go-inject-tag -input=./internal/scheduler/job/store/job.pb.go
|
|
@protoc-go-inject-tag -input=./internal/credential/store/credential.pb.go
|
|
@protoc-go-inject-tag -input=./internal/credential/vault/store/vault.pb.go
|
|
|
|
# these protos, services and openapi artifacts are purely for testing purposes
|
|
@protoc-go-inject-tag -input=./internal/gen/testing/event/event.pb.go
|
|
@protoc --proto_path=internal/proto/local --proto_path=internal/proto/third_party --openapiv2_out=json_names_for_fields=false,logtostderr=true,disable_default_errors=true,include_package_in_tags=true,fqn_for_openapi_name=true,allow_merge,merge_file_name=testing:internal/gen/testing/event/. internal/proto/local/testing/event/v1/*.proto
|
|
|
|
|
|
@rm -R ${TMP_DIR}
|
|
|
|
protolint:
|
|
@buf check lint
|
|
@buf check breaking --against 'https://github.com/hashicorp/boundary.git#branch=stable-website'
|
|
|
|
# must have nodejs and npm installed
|
|
website: website-install website-start
|
|
|
|
website-install:
|
|
@npm install --prefix website/
|
|
|
|
website-start:
|
|
@npm start --prefix website/
|
|
|
|
test-ci: install-go
|
|
~/.go/bin/go test ./... -v $(TESTARGS) -timeout 120m
|
|
|
|
test-sql:
|
|
$(MAKE) -C internal/db/sqltest/ test
|
|
|
|
test:
|
|
~/.go/bin/go test ./... -timeout 30m
|
|
|
|
install-go:
|
|
./ci/goinstall.sh
|
|
|
|
# Docker build and publish variables and targets
|
|
REGISTRY_NAME?=docker.io/hashicorp
|
|
IMAGE_NAME=boundary
|
|
VERSION?=0.6.0
|
|
IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(VERSION)
|
|
IMAGE_TAG_DEV=$(REGISTRY_NAME)/$(IMAGE_NAME):latest-$(shell git rev-parse --short HEAD)
|
|
DOCKER_DIR=./docker
|
|
|
|
docker: docker-build docker-publish
|
|
|
|
# builds from releases.hashicorp.com official binary
|
|
docker-build:
|
|
docker build -t $(IMAGE_TAG) \
|
|
--build-arg VERSION=$(VERSION) \
|
|
-f $(DOCKER_DIR)/Release.dockerfile docker/
|
|
docker tag $(IMAGE_TAG) hashicorp/boundary:latest
|
|
|
|
# builds multiarch from releases.hashicorp.com official binary
|
|
docker-multiarch-build:
|
|
docker buildx build \
|
|
--push \
|
|
--tag $(IMAGE_TAG) \
|
|
--tag hashicorp/boundary:latest \
|
|
--build-arg VERSION=$(VERSION) \
|
|
--platform linux/amd64,linux/arm64 \
|
|
--file $(DOCKER_DIR)/Release.dockerfile .
|
|
|
|
# builds from locally generated binary in bin/
|
|
docker-build-dev: export XC_OSARCH=linux/amd64
|
|
docker-build-dev: dev
|
|
docker build -t $(IMAGE_TAG_DEV) \
|
|
-f $(DOCKER_DIR)/Dev.dockerfile .
|
|
|
|
# requires appropriate permissions in dockerhub
|
|
docker-publish:
|
|
docker push $(IMAGE_TAG)
|
|
docker push hashicorp/boundary:latest
|
|
|
|
.PHONY: api cli tools gen migrations proto website ci-config ci-verify set-ui-version docker docker-build docker-build-dev docker-publish
|
|
|
|
.NOTPARALLEL:
|
|
|
|
ci-config:
|
|
@$(MAKE) -C .circleci ci-config
|
|
|
|
ci-verify:
|
|
@$(MAKE) -C .circleci ci-verify
|
|
|
|
PACKAGESPEC_CIRCLECI_CONFIG := .circleci/config/@build-release.yml
|
|
PACKAGESPEC_HOOK_POST_CI_CONFIG := $(MAKE) ci-config
|
|
|
|
-include packagespec.mk
|