Skip to content

fix(sdk): shutdown conn #352

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
dmihalcik-virtru merged 2 commits into from
Mar 11, 2024
Merged

fix(sdk): shutdown conn #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
391098d
fix(sdk): shutdown
pflynn-virtru Mar 11, 2024
1e52746
fix(sdk): receiver same
pflynn-virtru Mar 11, 2024
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
5 changes: 4 additions & 1 deletion sdk/sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ func buildKASClient(c *config) (KASClient, error) {

// Close closes the underlying grpc.ClientConn.
func (s SDK) Close() error {
if s.conn == nil {
return nil
}
if err := s.conn.Close(); err != nil {
return errors.Join(ErrShutdownFailed, err)
}
Expand All @@ -147,7 +150,7 @@ func (s SDK) Conn() *grpc.ClientConn {
return s.conn
}

// ExchangeToken exchanges a access token for a new token. https://datatracker.ietf.org/doc/html/rfc8693
// TokenExchange exchanges a access token for a new token. https://datatracker.ietf.org/doc/html/rfc8693
func (s SDK) TokenExchange(token string) (string, error) {
return "", nil
}
8 changes: 4 additions & 4 deletions sdk/tdf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ type Unwrapper interface {
}

// CreateTDF reads plain text from the given reader and saves it to the writer, subject to the given options
func (sdk SDK) CreateTDF(writer io.Writer, reader io.ReadSeeker, opts ...TDFOption) (*TDFObject, error) { //nolint:funlen, gocognit, lll
func (s SDK) CreateTDF(writer io.Writer, reader io.ReadSeeker, opts ...TDFOption) (*TDFObject, error) { //nolint:funlen, gocognit, lll
inputSize, err := reader.Seek(0, io.SeekEnd)
if err != nil {
return nil, fmt.Errorf("readSeeker.Seek failed: %w", err)
Expand All @@ -101,7 +101,7 @@ func (sdk SDK) CreateTDF(writer io.Writer, reader io.ReadSeeker, opts ...TDFOpti
return nil, fmt.Errorf("NewTDFConfig failed: %w", err)
}

err = fillInPublicKeys(sdk.unwrapper, tdfConfig.kasInfoList)
err = fillInPublicKeys(s.unwrapper, tdfConfig.kasInfoList)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -360,7 +360,7 @@ func (t *TDFObject) createPolicyObject(attributes []string) (PolicyObject, error
}

// LoadTDF loads the tdf and prepare for reading the payload from TDF
func (sdk SDK) LoadTDF(reader io.ReadSeeker) (*Reader, error) {
func (s SDK) LoadTDF(reader io.ReadSeeker) (*Reader, error) {
// create tdf reader
tdfReader, err := archive.NewTDFReader(reader)
if err != nil {
Expand All @@ -381,7 +381,7 @@ func (sdk SDK) LoadTDF(reader io.ReadSeeker) (*Reader, error) {
return &Reader{
tdfReader: tdfReader,
manifest: *manifestObj,
unwrapper: sdk.unwrapper,
unwrapper: s.unwrapper,
}, nil
}

Expand Down