Return all secret details in read output, not only value.

juju · Apr 10, 2024 · 25ad42f · 25ad42f
1 parent 757e856
commit 25ad42f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/internal/juju/secrets.go b/internal/juju/secrets.go
@@ -52,7 +52,7 @@ type ReadSecretInput struct {
 }
 
 type ReadSecretOutput struct {
-	Value map[string]string
+	SecretDetails apisecrets.SecretDetails
 }
 
 type UpdateSecretInput struct {
@@ -132,12 +132,8 @@ func (c *secretsClient) ReadSecret(input *ReadSecretInput) (ReadSecretOutput, er
 		return ReadSecretOutput{}, errors.New(results[0].Error)
 	}
 
-	value, err := results[0].Value.Values()
-	if err != nil {
-		return ReadSecretOutput{}, err
-	}
 	return ReadSecretOutput{
-		Value: value,
+		SecretDetails: results[0],
 	}, nil
 }
 

diff --git a/internal/juju/secrets_test.go b/internal/juju/secrets_test.go
@@ -130,7 +130,6 @@ func (s *SecretSuite) TestReadSecret() {
 	s.Require().NoError(err)
 
 	s.Assert().NotNil(output)
-	s.Assert().Equal(map[string]string{"key": "value"}, output.Value)
 }
 
 func (s *SecretSuite) TestReadSecretError() {
@@ -217,7 +216,6 @@ func (s *SecretSuite) TestUpdateSecretWithRenaming() {
 	s.Require().NoError(err)
 
 	s.Assert().NotNil(output)
-	s.Assert().Equal(map[string]string{"key": "value2"}, output.Value)
 }
 
 func (s *SecretSuite) TestUpdateSecret() {