Skip to content
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.

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

Bugs fixes for Secrets Manager #5008

Merged
merged 23 commits into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
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
76 changes: 47 additions & 29 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "go.mod|go.sum|.*.map|^.secrets.baseline$",
"lines": null
},
"generated_at": "2023-12-14T01:01:48Z",
"generated_at": "2023-12-26T12:35:45Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -760,23 +760,23 @@
"hashed_secret": "731438016c5ab94431f61820f35e3ae5f8ad6004",
"is_secret": false,
"is_verified": false,
"line_number": 426,
"line_number": 428,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "12da2e35d6b50c902c014f1ab9e3032650368df7",
"is_secret": false,
"is_verified": false,
"line_number": 432,
"line_number": 434,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "813274ccae5b6b509379ab56982d862f7b5969b6",
"is_secret": false,
"is_verified": false,
"line_number": 1143,
"line_number": 1157,
"type": "Base64 High Entropy String",
"verified_result": null
}
Expand Down Expand Up @@ -2056,31 +2056,31 @@
"hashed_secret": "deab23f996709b4e3d14e5499d1cc2de677bfaa8",
"is_secret": false,
"is_verified": false,
"line_number": 1367,
"line_number": 1372,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "20a25bac21219ffff1904bde871ded4027eca2f8",
"is_secret": false,
"is_verified": false,
"line_number": 1957,
"line_number": 1962,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
"is_secret": false,
"is_verified": false,
"line_number": 1976,
"line_number": 1981,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "1f5e25be9b575e9f5d39c82dfd1d9f4d73f1975c",
"is_secret": false,
"is_verified": false,
"line_number": 2189,
"line_number": 2194,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -3224,15 +3224,15 @@
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
"is_secret": false,
"is_verified": false,
"line_number": 185,
"line_number": 180,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
"is_secret": false,
"is_verified": false,
"line_number": 312,
"line_number": 307,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -3250,7 +3250,7 @@
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
"is_secret": false,
"is_verified": false,
"line_number": 291,
"line_number": 286,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -3298,15 +3298,15 @@
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
"is_secret": false,
"is_verified": false,
"line_number": 235,
"line_number": 230,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
"is_secret": false,
"is_verified": false,
"line_number": 414,
"line_number": 409,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -3510,15 +3510,15 @@
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
"is_secret": false,
"is_verified": false,
"line_number": 162,
"line_number": 157,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
"is_secret": false,
"is_verified": false,
"line_number": 278,
"line_number": 273,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -3556,23 +3556,23 @@
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
"is_secret": false,
"is_verified": false,
"line_number": 204,
"line_number": 198,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "108b310facc1a193833fc2971fd83081f775ea0c",
"is_secret": false,
"is_verified": false,
"line_number": 395,
"line_number": 389,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
"is_secret": false,
"is_verified": false,
"line_number": 398,
"line_number": 392,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -3636,15 +3636,15 @@
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
"is_secret": false,
"is_verified": false,
"line_number": 298,
"line_number": 297,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
"is_secret": false,
"is_verified": false,
"line_number": 539,
"line_number": 538,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -3831,6 +3831,24 @@
"verified_result": null
}
],
"ibm/service/secretsmanager/resource_ibm_sm_service_credentilas_secret.go": [
{
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
"is_secret": false,
"is_verified": false,
"line_number": 190,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "b732fb611fd46a38e8667f9972e0cde777fbe37f",
"is_secret": false,
"is_verified": false,
"line_number": 443,
"type": "Secret Keyword",
"verified_result": null
}
],
"ibm/service/secretsmanager/resource_ibm_sm_username_password_secret.go": [
{
"hashed_secret": "3046d9f6cfaaeea6eed9bb7a4ab010fe49b0cfd4",
Expand Down Expand Up @@ -4736,15 +4754,15 @@
"hashed_secret": "d47dcacc720a39e236679ac3e311a0d58bb6519e",
"is_secret": false,
"is_verified": false,
"line_number": 128,
"line_number": 127,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "e66e7d67fdf3c596c435fc7828b13205e4950a0f",
"is_secret": false,
"is_verified": false,
"line_number": 130,
"line_number": 129,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -4790,15 +4808,15 @@
"hashed_secret": "d47dcacc720a39e236679ac3e311a0d58bb6519e",
"is_secret": false,
"is_verified": false,
"line_number": 148,
"line_number": 147,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "e66e7d67fdf3c596c435fc7828b13205e4950a0f",
"is_secret": false,
"is_verified": false,
"line_number": 150,
"line_number": 149,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -4844,15 +4862,15 @@
"hashed_secret": "d47dcacc720a39e236679ac3e311a0d58bb6519e",
"is_secret": false,
"is_verified": false,
"line_number": 137,
"line_number": 139,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "e66e7d67fdf3c596c435fc7828b13205e4950a0f",
"is_secret": false,
"is_verified": false,
"line_number": 139,
"line_number": 141,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -5010,15 +5028,15 @@
"hashed_secret": "d47dcacc720a39e236679ac3e311a0d58bb6519e",
"is_secret": false,
"is_verified": false,
"line_number": 122,
"line_number": 121,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "e66e7d67fdf3c596c435fc7828b13205e4950a0f",
"is_secret": false,
"is_verified": false,
"line_number": 124,
"line_number": 123,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -5034,7 +5052,7 @@
}
]
},
"version": "0.13.1+ibm.51.dss",
"version": "0.13.1+ibm.61.dss",
"word_list": {
"file": null,
"hash": null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,6 @@ func DataSourceIbmSmIamCredentialsSecret() *schema.Resource {
Computed: true,
Description: "The units for the secret rotation time interval.",
},
"rotate_keys": &schema.Schema{
Type: schema.TypeBool,
Computed: true,
Description: "Determines whether Secrets Manager rotates the private key for your public certificate automatically.Default is `false`. If it is set to `true`, the service generates and stores a new private key for your rotated certificate.",
},
},
},
},
Expand Down Expand Up @@ -330,9 +325,6 @@ func dataSourceIbmSmIamCredentialsSecretRotationPolicyToMap(model secretsmanager
if model.Unit != nil {
modelMap["unit"] = *model.Unit
}
if model.RotateKeys != nil {
modelMap["rotate_keys"] = *model.RotateKeys
}
return modelMap, nil
} else {
return nil, fmt.Errorf("Unrecognized secretsmanagerv2.RotationPolicyIntf subtype encountered")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,6 @@ func DataSourceIbmSmIamCredentialsSecretMetadata() *schema.Resource {
Computed: true,
Description: "The units for the secret rotation time interval.",
},
"rotate_keys": &schema.Schema{
Type: schema.TypeBool,
Computed: true,
Description: "Determines whether Secrets Manager rotates the private key for your public certificate automatically.Default is `false`. If it is set to `true`, the service generates and stores a new private key for your rotated certificate.",
},
},
},
},
Expand Down Expand Up @@ -325,9 +320,6 @@ func dataSourceIbmSmIamCredentialsSecretMetadataRotationPolicyToMap(model secret
if model.Unit != nil {
modelMap["unit"] = *model.Unit
}
if model.RotateKeys != nil {
modelMap["rotate_keys"] = *model.RotateKeys
}
return modelMap, nil
} else {
return nil, fmt.Errorf("Unrecognized secretsmanagerv2.RotationPolicyIntf subtype encountered")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,6 @@ func DataSourceIbmSmPrivateCertificate() *schema.Resource {
Computed: true,
Description: "The units for the secret rotation time interval.",
},
"rotate_keys": &schema.Schema{
Type: schema.TypeBool,
Computed: true,
Description: "Determines whether Secrets Manager rotates the private key for your public certificate automatically.Default is `false`. If it is set to `true`, the service generates and stores a new private key for your rotated certificate.",
},
},
},
},
Expand Down Expand Up @@ -436,9 +431,6 @@ func dataSourceIbmSmPrivateCertificateRotationPolicyToMap(model secretsmanagerv2
if model.Unit != nil {
modelMap["unit"] = *model.Unit
}
if model.RotateKeys != nil {
modelMap["rotate_keys"] = *model.RotateKeys
}
return modelMap, nil
} else {
return nil, fmt.Errorf("Unrecognized secretsmanagerv2.RotationPolicyIntf subtype encountered")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,6 @@ func DataSourceIbmSmPrivateCertificateMetadata() *schema.Resource {
Computed: true,
Description: "The units for the secret rotation time interval.",
},
"rotate_keys": &schema.Schema{
Type: schema.TypeBool,
Computed: true,
Description: "Determines whether Secrets Manager rotates the private key for your public certificate automatically.Default is `false`. If it is set to `true`, the service generates and stores a new private key for your rotated certificate.",
},
},
},
},
Expand Down Expand Up @@ -403,9 +398,6 @@ func dataSourceIbmSmPrivateCertificateMetadataRotationPolicyToMap(model secretsm
if model.Unit != nil {
modelMap["unit"] = *model.Unit
}
if model.RotateKeys != nil {
modelMap["rotate_keys"] = *model.RotateKeys
}
return modelMap, nil
} else {
return nil, fmt.Errorf("Unrecognized secretsmanagerv2.RotationPolicyIntf subtype encountered")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,6 @@ func DataSourceIbmSmUsernamePasswordSecret() *schema.Resource {
Computed: true,
Description: "The units for the secret rotation time interval.",
},
"rotate_keys": &schema.Schema{
Type: schema.TypeBool,
Computed: true,
Description: "Determines whether Secrets Manager rotates the private key for your public certificate automatically.Default is `false`. If it is set to `true`, the service generates and stores a new private key for your rotated certificate.",
},
},
},
},
Expand Down Expand Up @@ -296,9 +291,6 @@ func dataSourceIbmSmUsernamePasswordSecretRotationPolicyToMap(model secretsmanag
if model.Unit != nil {
modelMap["unit"] = *model.Unit
}
if model.RotateKeys != nil {
modelMap["rotate_keys"] = *model.RotateKeys
}
return modelMap, nil
} else {
return nil, fmt.Errorf("Unrecognized secretsmanagerv2.RotationPolicyIntf subtype encountered")
Expand Down
Loading
Loading