Skip to content

Commit

Permalink
Merge branch 'v3' into poc-v3-otel-syslog
Browse files Browse the repository at this point in the history
  • Loading branch information
dhurley committed Dec 2, 2024
2 parents bbc3eb5 + 6e47e29 commit 29e07a0
Show file tree
Hide file tree
Showing 33 changed files with 879 additions and 1,205 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ include Makefile.tools
include Makefile.containers
include Makefile.packaging

.PHONY: help clean no-local-changes build lint format unit-test integration-test run dev run-mock-management-server generate generate-mocks local-apk-package local-deb-package local-rpm-package
.PHONY: help clean no-local-changes build lint format unit-test integration-test run dev run-mock-management-grpc-server generate generate-mocks local-apk-package local-deb-package local-rpm-package

help: ## Show help message
@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\033[36m\033[0m\n"} /^[$$()% 0-9a-zA-Z_-]+:.*?##/ { printf " \033[36m%-24s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The following packages need to be installed:
```
git clone https://github.com/open-telemetry/opentelemetry-collector.git
cd opentelemetry-collector
git checkout v0.108.1
git checkout v0.114.0
cd cmd/mdatagen
go install
```
Expand Down
133 changes: 66 additions & 67 deletions api/grpc/mpi/v1/files.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions api/grpc/mpi/v1/files.proto
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ message UpdateFileResponse {
// and https://github.com/googleapis/googleapis/blob/005df4681b89bd204a90b76168a6dc9d9e7bf4fe/google/cloud/iot/v1/resources.proto#L341
message CertificateMeta {
// Serial number of the certificate, usually a unique identifier, RFC5280 states the upper limit for serial number is 20 octets
bytes serial_number = 1 [(buf.validate.field).bytes.min_len = 1, (buf.validate.field).bytes.max_len = 21];
bytes serial_number = 1 [(buf.validate.field).bytes.min_len = 0, (buf.validate.field).bytes.max_len = 21];

// Issuer details (who issued the certificate)
X509Name issuer = 2;
Expand Down Expand Up @@ -267,8 +267,7 @@ message X509Name {
repeated string postal_code = 7 [(buf.validate.field).repeated.items.string.min_len = 1];

// Serial Number (SN): Unique identifier or serial number.
// Must be non-empty.
string serial_number = 8 [(buf.validate.field).string.min_len = 1];
string serial_number = 8 [(buf.validate.field).string.min_len = 0, (buf.validate.field).string.max_len = 21];

// Common Name (CN): Typically the person’s or entity's full name.
string common_name = 9 [(buf.validate.field).string.min_len = 1];
Expand Down
2 changes: 1 addition & 1 deletion docs/proto/protos.md
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ Represents the dates for which a certificate is valid as seen at https://pkg.go.
| province | [string](#string) | repeated | State or Province name (ST): Name of the state or province. |
| street_address | [string](#string) | repeated | Street Address (STREET): Physical street address. |
| postal_code | [string](#string) | repeated | Postal Code (PC): Postal or ZIP code for the address. |
| serial_number | [string](#string) | | Serial Number (SN): Unique identifier or serial number. Must be non-empty. |
| serial_number | [string](#string) | | Serial Number (SN): Unique identifier or serial number. |
| common_name | [string](#string) | | Common Name (CN): Typically the person’s or entity's full name. |
| names | [AttributeTypeAndValue](#mpi-v1-AttributeTypeAndValue) | repeated | Parsed attributes including any non-standard attributes, as specified in RFC 2253. These attributes are parsed but not marshaled by this package. |
| extra_names | [AttributeTypeAndValue](#mpi-v1-AttributeTypeAndValue) | repeated | Additional attributes to be included in the marshaled distinguished names. These override any attributes with the same OID in `names`. |
Expand Down
Loading

0 comments on commit 29e07a0

Please sign in to comment.