mirror of
https://github.com/opentffoundation/opentf.git
synced 2025-12-21 10:47:34 -05:00
d2bef1fd47
Previously we were using a third-party library, but that doesn't have any
support for passing context.Context through its API and so isn't suitable
for our goals of adding OpenTelemetry tracing for all outgoing network
requests.
We now have our own fork that is updated to use context.Context. It also
has a slightly reduced scope no longer including various details that
are tightly-coupled to our cliconfig mechanism and so better placed in the
main OpenTofu codebase so we can evolve it in future without making
lockstep library releases.
The "registry-address" library also uses svchost and uses some of its types
in its public API, so this also incorporates v2 of that library that is
updated to use our own svchost module.
Unfortunately this commit is a mix of mechanical updates to the new
libraries and some new code dealing with the functionality that is removed
in our fork of svchost. The new code is primarily in the "svcauthconfig"
package, which is similar in purpose "ociauthconfig" but for OpenTofu's
own auth mechanism instead of the OCI Distribution protocol's auth
mechanism.
This includes some additional plumbing of context.Context where it was
possible to do so without broad changes to files that would not otherwise
have been included in this commit, but there are a few leftover spots that
are context.TODO() which we'll address separately in later commits.
This removes the temporary workaround from d079da6e9e, since we are now
able to plumb the OpenTelemetry span tree all the way to the service
discovery requests.
Signed-off-by: Martin Atkins <mart@degeneration.co.uk>
55 lines
1.8 KiB
Go
55 lines
1.8 KiB
Go
// Copyright (c) The OpenTofu Authors
|
|
// SPDX-License-Identifier: MPL-2.0
|
|
// Copyright (c) 2023 HashiCorp, Inc.
|
|
// SPDX-License-Identifier: MPL-2.0
|
|
|
|
package svcauthconfig
|
|
|
|
import (
|
|
"github.com/opentofu/svchost/svcauth"
|
|
"github.com/zclconf/go-cty/cty"
|
|
)
|
|
|
|
// HostCredentialsFromMap converts a map of key-value pairs from a credentials
|
|
// definition provided by the user (e.g. in a config file, or via a credentials
|
|
// helper) into a HostCredentials object if possible, or returns nil if
|
|
// no credentials could be extracted from the map.
|
|
//
|
|
// This function ignores map keys it is unfamiliar with, to allow for future
|
|
// expansion of the credentials map format for new credential types.
|
|
func HostCredentialsFromMap(m map[string]any) svcauth.HostCredentials {
|
|
if m == nil {
|
|
return nil
|
|
}
|
|
if token, ok := m["token"].(string); ok {
|
|
return svcauth.HostCredentialsToken(token)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// HostCredentialsFromObject converts a cty.Value of an object type into a
|
|
// HostCredentials object if possible, or returns nil if no credentials could
|
|
// be extracted from the map.
|
|
//
|
|
// This function ignores object attributes it is unfamiliar with, to allow for
|
|
// future expansion of the credentials object structure for new credential types.
|
|
//
|
|
// If the given value is not of an object type, this function will panic.
|
|
func HostCredentialsFromObject(obj cty.Value) svcauth.HostCredentials {
|
|
if !obj.Type().HasAttribute("token") {
|
|
return nil
|
|
}
|
|
|
|
tokenV := obj.GetAttr("token")
|
|
if tokenV.IsNull() || !tokenV.IsKnown() {
|
|
return nil
|
|
}
|
|
if !cty.String.Equals(tokenV.Type()) {
|
|
// Weird, but maybe some future version accepts an object here for some
|
|
// reason, so we'll tolerate that for forward-compatibility.
|
|
return nil
|
|
}
|
|
|
|
return svcauth.HostCredentialsToken(tokenV.AsString())
|
|
}
|