Skip to content

Omit empty fields from DeviceCredential resources #27821

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.

Sign up for GitHub

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

Merged
codingllama merged 3 commits into from
Jun 14, 2023
Merged

Omit empty fields from DeviceCredential resources #27821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfa068e
Set "omitempty" in optional credential fields
codingllama Jun 13, 2023
fe84409
Update generated protos
codingllama Jun 13, 2023
009378e
Use "" as the value for DEVICE_ATTESTATION_TYPE_UNSPECIFIED
codingllama Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions api/proto/teleport/legacy/types/device.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ message DeviceSpec {
// teleport.devicetrust.v1.DeviceCredential.
message DeviceCredential {
string id = 1 [(gogoproto.jsontag) = "id"];
bytes public_key_der = 2 [(gogoproto.jsontag) = "public_key_der"];
string device_attestation_type = 3 [(gogoproto.jsontag) = "device_attestation_type"];
string tpm_ekcert_serial = 4 [(gogoproto.jsontag) = "tpm_ekcert_serial"];
bytes tpm_ak_public = 5 [(gogoproto.jsontag) = "tpm_ak_public"];
bytes public_key_der = 2 [(gogoproto.jsontag) = "public_key_der,omitempty"];
string device_attestation_type = 3 [(gogoproto.jsontag) = "device_attestation_type,omitempty"];
string tpm_ekcert_serial = 4 [(gogoproto.jsontag) = "tpm_ekcert_serial,omitempty"];
bytes tpm_ak_public = 5 [(gogoproto.jsontag) = "tpm_ak_public,omitempty"];
}

// DeviceCollectedData is the resource representation of
Expand Down
3 changes: 2 additions & 1 deletion api/types/device.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,8 @@ func ResourceDeviceAttestationTypeToString(
) string {
switch attestationType {
case devicepb.DeviceAttestationType_DEVICE_ATTESTATION_TYPE_UNSPECIFIED:
return "unspecified"
// Default to empty, so it doesn't show in non-TPM devices.
return ""
case devicepb.DeviceAttestationType_DEVICE_ATTESTATION_TYPE_TPM_EKPUB:
return "tpm_ekpub"
case devicepb.DeviceAttestationType_DEVICE_ATTESTATION_TYPE_TPM_EKCERT:
Expand Down
186 changes: 93 additions & 93 deletions api/types/device.pb.go
View file
Open in desktop

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

Loading