Merge remote-tracking branch 'refs/remotes/origin/raise-alpine-version'

into raise-alpine-version
open-component-model · Aug 22, 2024 · d01d30b · d01d30b
2 parents 2e33450 + 959b86e
commit d01d30b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/api/credentials/builtin/oci/identity/identity.go b/api/credentials/builtin/oci/identity/identity.go
@@ -6,7 +6,7 @@ import (
 	"ocm.software/ocm/api/utils/listformat"
 )
 
-// CONSUMER_TYPE is the OCT registry type.
+// CONSUMER_TYPE is the OCI registry type.
 const CONSUMER_TYPE = "OCIRegistry"
 
 // used identity properties.
@@ -28,7 +28,7 @@ const (
 
 func init() {
 	attrs := listformat.FormatListElements("", listformat.StringElementDescriptionList{
-		ATTR_USERNAME, "the basic auth user name",
+		ATTR_USERNAME, "the basic auth username",
 		ATTR_PASSWORD, "the basic auth password",
 		ATTR_IDENTITY_TOKEN, "the bearer token used for non-basic auth authorization",
 		ATTR_CERTIFICATE_AUTHORITY, "the certificate authority certificate used to verify certificates",

diff --git a/docs/reference/ocm_credential-handling.md b/docs/reference/ocm_credential-handling.md
@@ -191,7 +191,7 @@ The following credential consumer types are used/supported:
 
     Credential consumers of the consumer type OCIRegistry evaluate the following credential properties:
 
-      - <code>username</code>: the basic auth user name
+      - <code>username</code>: the basic auth username
       - <code>password</code>: the basic auth password
       - <code>identityToken</code>: the bearer token used for non-basic auth authorization
       - <code>certificateAuthority</code>: the certificate authority certificate used to verify certificates

diff --git a/docs/reference/ocm_get_credentials.md b/docs/reference/ocm_get_credentials.md
@@ -117,7 +117,7 @@ Matchers exist for the following usage contexts or consumer types:
 
     Credential consumers of the consumer type OCIRegistry evaluate the following credential properties:
 
-      - <code>username</code>: the basic auth user name
+      - <code>username</code>: the basic auth username
       - <code>password</code>: the basic auth password
       - <code>identityToken</code>: the bearer token used for non-basic auth authorization
       - <code>certificateAuthority</code>: the certificate authority certificate used to verify certificates

diff --git a/hack/Makefile b/hack/Makefile
@@ -65,7 +65,10 @@ ifneq ($(OCI_REGISTRY), $(OCI_REGISTRY_VERSION))
 endif
 
 .PHONY: install-requirements
-install-requirements: $(deps) $(GOPATH)/bin/goimports mdref
+install-requirements: mkbin $(deps) $(GOPATH)/bin/goimports mdref
+
+mkbin:
+	mkdir -p $(LOCALBIN)
 
 .PHONY: gci
 gci: