diff --git a/cli/command/trust/formatter.go b/cli/command/trust/formatter.go index e536995fd7..b3f8f1a5ae 100644 --- a/cli/command/trust/formatter.go +++ b/cli/command/trust/formatter.go @@ -17,14 +17,6 @@ const ( keysHeader = "KEYS" ) -// SignedTagInfo represents all formatted information needed to describe a signed tag: -// Name: name of the signed tag -// Digest: hex encoded digest of the contents -// Signers: list of entities who signed the tag -// -// Deprecated: this type was only used internally and will be removed in the next release. -type SignedTagInfo = signedTagInfo - // signedTagInfo represents all formatted information needed to describe a signed tag: // Name: name of the signed tag // Digest: hex encoded digest of the contents @@ -35,13 +27,6 @@ type signedTagInfo struct { Signers []string } -// SignerInfo represents all formatted information needed to describe a signer: -// Name: name of the signer role -// Keys: the keys associated with the signer -// -// Deprecated: this type was only used internally and will be removed in the next release. -type SignerInfo = signerInfo - // signerInfo represents all formatted information needed to describe a signer: // Name: name of the signer role // Keys: the keys associated with the signer @@ -50,27 +35,6 @@ type signerInfo struct { Keys []string } -// NewTrustTagFormat returns a Format for rendering using a trusted tag Context -// -// Deprecated: this function was only used internally and will be removed in the next release. -func NewTrustTagFormat() formatter.Format { - return defaultTrustTagTableFormat -} - -// NewSignerInfoFormat returns a Format for rendering a signer role info Context -// -// Deprecated: this function was only used internally and will be removed in the next release. -func NewSignerInfoFormat() formatter.Format { - return defaultSignerInfoTableFormat -} - -// TagWrite writes the context -// -// Deprecated: this function was only used internally and will be removed in the next release. -func TagWrite(fmtCtx formatter.Context, signedTagInfoList []signedTagInfo) error { - return tagWrite(fmtCtx, signedTagInfoList) -} - // tagWrite writes the context func tagWrite(fmtCtx formatter.Context, signedTagInfoList []signedTagInfo) error { render := func(format func(subContext formatter.SubContext) error) error { @@ -111,13 +75,6 @@ func (c *trustTagContext) Signers() string { return strings.Join(c.s.Signers, ", ") } -// SignerInfoWrite writes the context -// -// Deprecated: this function was only used internally and will be removed in the next release. -func SignerInfoWrite(fmtCtx formatter.Context, signerInfoList []signerInfo) error { - return signerInfoWrite(fmtCtx, signerInfoList) -} - // signerInfoWrite writes the context. func signerInfoWrite(fmtCtx formatter.Context, signerInfoList []signerInfo) error { render := func(format func(subContext formatter.SubContext) error) error {