Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.2.1 #595

Merged
merged 9 commits into from
Sep 2, 2024
4 changes: 2 additions & 2 deletions .gitlab-ci-scripts/local-before-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ echo "======== oidc-agent-local-before-script starting======="
export VERSION=`cat VERSION`
# clone the packages file of this repo:
# Try with VERSION
echo "Trying to use branch for packaging: ${PACKAGING_BRANCH}/test-ellert-spec"
git clone -b ${PACKAGING_BRANCH}/test-ellert-spec http://codebase.helmholtz.cloud/m-team/oidc/oidc-agent.git delme || {
echo "Trying to use branch for packaging: ${PACKAGING_BRANCH}/latest"
git clone -b ${PACKAGING_BRANCH}/latest http://codebase.helmholtz.cloud/m-team/oidc/oidc-agent.git delme || {
exit 10
}

Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
<!-- ### Dependencies -->
<!-- -->

## oidc-agent 5.2.1

### Bugfixes

- Fixed permissions on static lib
- Removed bash completion for `oidc-tokensh`
- Fixed options passing from `oidc-agent-service` to `oidc-agent`

## oidc-agent 5.2.0

### Features
Expand Down
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ install_conf: $(CONFIG_PATH)/oidc-agent/$(PROVIDERCONFIGD) $(CONFIG_PATH)/oidc-a
@echo "Installed config files"

.PHONY: install_bash
install_bash: $(BASH_COMPLETION_PATH)/$(AGENT) $(BASH_COMPLETION_PATH)/$(GEN) $(BASH_COMPLETION_PATH)/$(ADD) $(BASH_COMPLETION_PATH)/$(CLIENT) $(BASH_COMPLETION_PATH)/$(AGENT_SERVICE) $(BASH_COMPLETION_PATH)/$(KEYCHAIN) $(BASH_COMPLETION_PATH)/$(TOKENSH)
install_bash: $(BASH_COMPLETION_PATH)/$(AGENT) $(BASH_COMPLETION_PATH)/$(GEN) $(BASH_COMPLETION_PATH)/$(ADD) $(BASH_COMPLETION_PATH)/$(CLIENT) $(BASH_COMPLETION_PATH)/$(AGENT_SERVICE) $(BASH_COMPLETION_PATH)/$(KEYCHAIN)
@echo "Installed bash completion"

.PHONY: install_man
Expand Down Expand Up @@ -700,9 +700,6 @@ $(BASH_COMPLETION_PATH)/$(CLIENT): $(BASH_COMPLETION_PATH)
$(BASH_COMPLETION_PATH)/$(KEYCHAIN): $(BASH_COMPLETION_PATH)
@ln -s $(AGENT) $@

$(BASH_COMPLETION_PATH)/$(TOKENSH): $(BASH_COMPLETION_PATH)
@ln -s $(AGENT) $@

$(BASH_COMPLETION_PATH)/$(AGENT_SERVICE): $(CONFDIR)/bash-completion/oidc-agent-service $(BASH_COMPLETION_PATH)
@install -p -m 644 $< $@

Expand Down Expand Up @@ -755,7 +752,7 @@ $(INCLUDE_PATH)/oidc-agent/oidc_error.h: $(SRCDIR)/utils/oidc_error.h $(INCLUDE_
@install -p -m 644 $< $@

$(LIBDEV_PATH)/liboidc-agent.a: $(APILIB)/liboidc-agent.a $(LIBDEV_PATH)
@install -p $< $@
@install -p -m 644 $< $@

endif

Expand Down Expand Up @@ -826,7 +823,6 @@ uninstall_bashcompletion:
@$(rm) $(BASH_COMPLETION_PATH)/$(AGENT)
@$(rm) $(BASH_COMPLETION_PATH)/$(AGENT_SERVICE)
@$(rm) $(BASH_COMPLETION_PATH)/$(KEYCHAIN)
@$(rm) $(BASH_COMPLETION_PATH)/$(TOKENSH)
@echo "Uninstalled bash completion"

endif
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.2.0
5.2.1
2 changes: 1 addition & 1 deletion src/oidc-agent-service/oidc-agent-service
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function echo_vars() {
}

function start() {
json=$(${OIDC_AGENT} -a "${SOCK}" "${OIDC_AGENT_OPTS}" --pid-file="${PID_FILE}" --json)
json=$(${OIDC_AGENT} -a "${SOCK}" ${OIDC_AGENT_OPTS} --pid-file="${PID_FILE}" --json)
OIDCD_PID=$(${ECHO} "${json}" | "${JQ}" -r ".dpid")
echo_vars
}
Expand Down
Loading