Skip to content

Conversation

tobert
Copy link
Collaborator

@tobert tobert commented Feb 22, 2023

In #150 I didn't get all of the TLS variable name and config keys to match, which is already confusing me. In order to make things consistent as noted in #164, this renames all variables, template placeholders, and config keys to match the command line flags.

While cleaning up I found a few config things I missed and added them, along with test coverage.

It does change functionality a bit in the config file but no versions have been released with those keys available.

Amy Tobey added 3 commits February 22, 2023 00:27
Renames NoTlsVerify to TlsNoVerify, adds Tls prefix to client cert
vars & config keys.

Adds missing config methods.

Update tests to match new keys & methods.

Fills in some gaps from first adding the TLS support.

Adds comments indicating --no-tls-verify and its related envvar are
deprecated.
Copy link

@chuson chuson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, merge if you don't agree w/ my nit otherwise I can approve again.

Comment on lines +124 to +127
| --tls-no-verify | OTEL_CLI_TLS_NO_VERIFY | tls_no_verify | false |
| --tls-ca-cert | OTEL_EXPORTER_OTLP_CERTIFICATE | tls_ca_cert | |
| --tls-client-key | OTEL_EXPORTER_OTLP_CLIENT_KEY | tls_client_key | |
| --tls-client-cert | OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE | tls_client_cert | |
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Do you care that the second column isn't aligned here now?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I care, but chose to do that so the whole table wouldn't reformat in the diff. The MD will render the table aligned in the browser so it felt like an ok tradeoff for now.

@tobert tobert merged commit 6018f76 into main Feb 23, 2023
@tobert tobert deleted the tls-flag-cleanup branch February 23, 2023 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants