Release 3.0.0

.dockerignore

@@ -0,0 +1,6 @@
+log/
+misc/
+dev/
+_build/
+rel/pkg/
+rel/stanchion/

.gitignore

@@ -1,13 +1,9 @@
 .eunit/*
-deps/*
-priv/*
+_build/
 rel/stanchion
-ebin/*.beam
-ebin/*.app
-doc
 dev
 /package/
 log/
 *~
 /log
-riak_test/bin/stanchion*
+riak_test/bin/stanchion*

Dockerfile

@@ -0,0 +1,20 @@
+FROM erlang:22 AS compile-image
+
+EXPOSE 8085
+
+WORKDIR /usr/src/stanchion
+COPY . /usr/src/stanchion
+
+# When running in a docker container, ideally we would want our app to
+# be configurable via environment variables (option --env-file to
+# docker run).  For that reason, We use a pared-down, cuttlefish-less
+# rebar.config.  Configuration from environment now becomes possible,
+# via rebar's own method of generating sys.config from
+# /sys.config.src.
+RUN make rel-docker
+
+FROM debian:bullseye AS runtime-image
+
+COPY --from=compile-image /usr/src/stanchion/rel/stanchion /opt/stanchion
+
+CMD /opt/stanchion/bin/stanchion foreground

Makefile

@@ -1,107 +1,134 @@
 REPO		?= stanchion
-
-PKG_REVISION    ?= $(shell git describe --tags)
-PKG_VERSION	?= $(shell git describe --tags | tr - .)
-PKG_ID           = stanchion-$(PKG_VERSION)
+HEAD_REVISION   ?= $(shell git describe --tags --exact-match HEAD 2>/dev/null)
+PKG_REVISION    ?= $(shell git describe --tags 2>/dev/null)
 PKG_BUILD        = 1
 BASE_DIR         = $(shell pwd)
-ERLANG_BIN       = $(shell dirname $(shell which erl))
-REBAR           ?= $(BASE_DIR)/rebar
+ERLANG_BIN       = $(shell dirname $(shell which erl 2>/dev/null) 2>/dev/null)
+OTP_VER          = $(shell erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell)
+REBAR           ?= $(BASE_DIR)/rebar3
 OVERLAY_VARS    ?=
 
 .PHONY: rel deps test
 
-all: deps compile
+all: compile
 
-compile: deps
-	@(./rebar compile)
+compile:
+	@($(REBAR) compile)
 
 deps:
-	@./rebar get-deps
+	@$(REBAR) upgrade --all
 
 clean:
-	@./rebar clean
-
-distclean: clean
-	@./rebar delete-deps
-	@rm -rf $(PKG_ID).tar.gz
+	@$(REBAR) clean
 
-parity-test:
-	@python test/prototype_parity.py -v
+distclean: clean devclean relclean
+	@rm -rf _build
 
 ##
 ## Release targets
 ##
-rel: deps compile
-	@./rebar compile
-	@./rebar skip_deps=true generate $(OVERLAY_VARS)
+rel: compile
+	@$(REBAR) as rel release
+	@cp -a _build/rel/rel/stanchion rel/
+
+rel-rpm: compile relclean
+	@$(REBAR) as rpm release
+	@cp -a _build/rpm/rel/stanchion rel/
+
+rel-deb: compile relclean
+	@$(REBAR) as deb release
+	@cp -a _build/deb/rel/stanchion rel/
+
+rel-fbsdng: compile relclean
+	@$(REBAR) as fbsdng release
+	@cp -a _build/fbsdng/rel/stanchion rel/
+
+rel-alpine: compile relclean
+	@$(REBAR) as alpine release
+	@(cd _build/alpine/rel/stanchion/usr/bin && mv stanchion.nosu stanchion)
+	@cp -a _build/alpine/rel/stanchion rel/
+
+rel-osx: compile relclean
+	@$(REBAR) as osx release
+	@cp -a _build/osx/rel/stanchion rel/
+
+rel-docker: compile relclean
+	@REBAR_CONFIG=rebar.docker.config $(REBAR) release
+	@cp -a _build/default/rel/stanchion rel/
 
 relclean:
-	rm -rf rel/stanchion
+	@rm -rf _build/rel rel/stanchion
+
+test:
+	@$(REBAR) eunit
+	@$(REBAR) dialyzer
 
 ##
 ## Developer targets
 ##
-stage : rel
-	$(foreach dep,$(wildcard deps/*), rm -rf rel/stanchion/lib/$(shell basename $(dep))-* && ln -sf $(abspath $(dep)) rel/stanchion/lib;)
-	$(foreach app,$(wildcard apps/*), rm -rf rel/stanchion/lib/$(shell basename $(app))-* && ln -sf $(abspath $(app)) rel/stanchion/lib;)
-
 devrel: all
-	mkdir -p dev
-	@./rebar skip_deps=true generate target_dir=../dev/$(REPO) \
-		overlay_vars=dev_vars.config
+	@mkdir -p dev
+	@$(REBAR) as rel release -o dev --overlay_vars rel/dev_vars.config
 
 stagedevrel: devrel
-	$(foreach app,$(wildcard apps/*), rm -rf dev/$(REPO)/lib/$(shell basename $(app))* && ln -sf $(abspath $(app)) dev/$(REPO)/lib;)
-	$(foreach dep,$(wildcard deps/*), rm -rf dev/$(REPO)/lib/$(shell basename $(dep))* && ln -sf $(abspath $(dep)) dev/$(REPO)/lib;)
 
 devclean: clean
 	rm -rf dev
 
 ##
-## Doc targets
+## Version and naming variables for distribution and packaging
 ##
-orgs: orgs-doc orgs-README
-
-orgs-doc:
-	@emacs -l orgbatch.el -batch --eval="(riak-export-doc-dir \"doc\" 'html)"
-
-orgs-README:
-	@emacs -l orgbatch.el -batch --eval="(riak-export-doc-file \"README.org\" 'ascii)"
-	@mv README.txt README
 
-DIALYZER_APPS = kernel stdlib sasl erts ssl tools os_mon runtime_tools crypto inets \
-	xmerl webtool eunit syntax_tools compiler
-PLT ?= $(HOME)/.stanchion_dialyzer_plt
+# Tag from git with style <tagname>-<commits_since_tag>-<current_commit_hash>
+# Ex: When on a tag:            riak-1.0.3   (no commits since tag)
+#     For most normal Commits:  riak-1.1.0pre1-27-g1170096
+#                                 Last tag:          riak-1.1.0pre1
+#                                 Commits since tag: 27
+#                                 Hash of commit:    g1170096
+REPO_TAG 	:= $(shell git describe --tags)
+
+# Split off repo name
+# Changes to 1.0.3 or 1.1.0pre1-27-g1170096 from example above
+REVISION = $(shell echo $(REPO_TAG) | sed -e 's/^$(REPO)-//')
+
+# Primary version identifier, strip off commmit information
+# Changes to 1.0.3 or 1.1.0pre1 from example above
+MAJOR_VERSION	?= $(shell echo $(REVISION) | sed -e 's/\([0-9.]*\)-.*/\1/')
+
+# Name resulting directory & tar file based on current status of the git tag
+# If it is a tagged release (PKG_VERSION == MAJOR_VERSION), use the toplevel
+#   tag as the package name, otherwise generate a unique hash of all the
+#   dependencies revisions to make the package name unique.
+#   This enables the toplevel repository package to change names
+#   when underlying dependencies change.
+NAME_HASH = $(shell git hash-object distdir/$(CLONEDIR)/$(MANIFEST_FILE) 2>/dev/null | cut -c 1-8)
+PKG_ID := "$(REPO_TAG)-OTP$(OTP_VER)"
 
 ##
 ## Packaging targets
 ##
+
+# Yes another variable, this one is repo-<generatedhash
+# which differs from $REVISION that is repo-<commitcount>-<commitsha>
+PKG_VERSION = $(shell echo $(PKG_ID) | sed -e 's/^$(REPO)-//')
+
+package:
+	mkdir -p rel/pkg/out/stanchion-$(PKG_ID)
+	git archive --format=tar HEAD | gzip >rel/pkg/out/$(PKG_ID).tar.gz
+	$(MAKE) -f rel/pkg/Makefile
+
+packageclean:
+	rm -rf rel/pkg/out/*
+
+
 .PHONY: package
 export PKG_VERSION PKG_ID PKG_BUILD BASE_DIR ERLANG_BIN REBAR OVERLAY_VARS RELEASE
 
-package.src: deps
-	mkdir -p package
-	rm -rf package/$(PKG_ID)
-	git archive --format=tar --prefix=$(PKG_ID)/ $(PKG_REVISION)| (cd package && tar -xf -)
-	${MAKE} -C package/$(PKG_ID) deps
-	mkdir -p package/$(PKG_ID)/priv
-	git --git-dir=.git describe --tags >package/$(PKG_ID)/priv/vsn.git
-	for dep in package/$(PKG_ID)/deps/*; do \
-             echo "Processing dep: $${dep}"; \
-             mkdir -p $${dep}/priv; \
-             git --git-dir=$${dep}/.git describe --tags >$${dep}/priv/vsn.git; \
-        done
-	find package/$(PKG_ID) -depth -name ".git" -exec rm -rf {} \;
-	tar -C package -czf package/$(PKG_ID).tar.gz $(PKG_ID)
-
-dist: package.src
-	cp package/$(PKG_ID).tar.gz .
-
-package: package.src
-	${MAKE} -C package -f $(PKG_ID)/deps/node_package/Makefile
-
-pkgclean: distclean
-	rm -rf package
-
-include tools.mk
+# Package up a devrel to save time later rebuilding it
+pkg-devrel: devrel
+	echo -n $(PKG_REVISION) > VERSION
+	tar -czf $(PKG_ID)-devrel.tar.gz dev/ VERSION
+	rm -rf VERSION
+
+pkg-rel: rel
+	tar -czf $(PKG_ID)-rel.tar.gz -C rel/ .

RELEASE-NOTES.org

@@ -1,5 +1,38 @@
+* Stanchion 3.0.0 Release Notes
+** Changes
+- This release is to be used with Riak CS 3.0.0. It requires
+  OTP-22 and rebar3, with no changes that would affect the user
+  otherwise.
+- Packages (rpm and deb) now rely on systemd, currently available for
+  Centos 7 and 8, Debian 8 and 11, FreeBSD 13 and OSX 14.
+- A Dockerfile.
+* Stanchion 2.1.2 Release Notes
+** Additions
+- Update to node_package 3.0.0
+* Stanchion 2.1.1 Release Notes
+** Bugs Fixed
+- Remove admin.secret from configuration (riak_cs/#1274)
+* Stanchion 2.1.0 Release Notes
+** Additions
+- Add statistics reporting
+- Add exometer_core 1.2
+- Update to cuttlefish 2.0.4
+- Update to eper 0.92-basho1
+- Update to lager 2.2.0
+- Update to lager_syslog 2.1.1
+- Update to node_package 2.0.3
+- Update to riakc 2.1.1
+* Stanchion 2.0.0 Release Notes
+** Additions
+- Change to cuttlefish-based configuration
+- Add cuttlefish 2.0.1
+- Update to eper 0.78
+- Update to node_package 2.0.1
+- Update to riakc 2.1.0
+- Update to webmachine 1.10.8
+- Update to Erlang/OTP R16B02
 * Stanchion 1.5.0 Release Notes
-** Addisions
+** Additions
 - Update to lager 2.0.3
 - Compiles with R16B0x (Releases still by R15B01)
 ** Bugs Fixed

apps/stanchion/include/stanchion.hrl

@@ -0,0 +1,34 @@
+%% ---------------------------------------------------------------------
+%%
+%% Copyright (c) 2007-2013 Basho Technologies, Inc.  All Rights Reserved.
+%%               2021 TI Tokyo    All Rights Reserved.
+%%
+%% This file is provided to you under the Apache License,
+%% Version 2.0 (the "License"); you may not use this file
+%% except in compliance with the License.  You may obtain
+%% a copy of the License at
+%%
+%%   http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing,
+%% software distributed under the License is distributed on an
+%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+%% KIND, either express or implied.  See the License for the
+%% specific language governing permissions and limitations
+%% under the License.
+%%
+%% ---------------------------------------------------------------------
+
+-record(context, {auth_bypass :: boolean(),
+                  bucket :: undefined | binary(),
+                  owner_id :: undefined | all | string()}).
+
+-define(TURNAROUND_TIME(Call),
+        begin
+            StartTime_____tat = os:timestamp(),
+            Result_____tat  = (Call),
+            EndTime_____tat = os:timestamp(),
+            {Result_____tat,
+             timer:now_diff(EndTime_____tat,
+                            StartTime_____tat)}
+        end).

src/stanchion.app.src → apps/stanchion/src/stanchion.app.src

@@ -2,6 +2,10 @@
 {application, stanchion,
  [
   {description, "stanchion"},
+  %% 'git' may introduce a '+' character (when building not from a
+  %% tag), and that plus sign will not go down well with freebsd pkg
+  %% ('+' is not allowed in +MANIFEST file).  Hence we produce a
+  %% version of vsn that doesn't have it.
   {vsn, git},
   {modules, []},
   {registered, []},
@@ -12,7 +16,10 @@
                   crypto,
                   mochiweb,
                   webmachine,
-                  lager
+                  exometer_core,
+                  lager,
+                  riakc,
+                  rcs_common
                  ]},
   {mod, { stanchion_app, []}},
   {env, [