Skip to content

HELP-28512: mongocli cannot handle net.tls.FIPSMode properly #893

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
merged 1 commit into from
Oct 20, 2021
Merged

HELP-28512: mongocli cannot handle net.tls.FIPSMode properly #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/stretchr/testify v1.7.0
github.com/tangzero/inflector v1.0.0
go.mongodb.org/atlas v0.13.0
go.mongodb.org/ops-manager v0.30.0
go.mongodb.org/ops-manager v0.30.1
gopkg.in/yaml.v2 v2.4.0
)

Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,8 @@ go.mongodb.org/atlas v0.13.0 h1:JkJOWsKm9k2mcFaivaaMNDpKDsxJJj1O0eUsDtnNvuE=
go.mongodb.org/atlas v0.13.0/go.mod h1:wVCnHcm/7/IfTjEB6K8K35PLG70yGz8BdkRwX0oK9/M=
go.mongodb.org/ops-manager v0.30.0 h1:8nKyxdUo83cRny4kVOcDeZzf09WseVF5RtHUtGxHpZ0=
go.mongodb.org/ops-manager v0.30.0/go.mod h1:x3CljG6FzfD/DwPCkt/7fKpGccKpHk91VlLOgK0eMTE=
go.mongodb.org/ops-manager v0.30.1 h1:AI15ZQxQaSfbCY96A60ZLDlT3gA0WsPWncxdHDrc5xE=
go.mongodb.org/ops-manager v0.30.1/go.mod h1:5S1wIr61QVUDhPyRiB35iEPocLd4WpJALejUMe9fHuI=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
Expand Down
3 changes: 2 additions & 1 deletion internal/convert/automation_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

func TestFromAutomationConfig(t *testing.T) {
name := "cluster_1"
fipsMode := true
t.Run("replica set", func(t *testing.T) {
t.Parallel()
config := fixture.AutomationConfigWithOneReplicaSet(name, false)
Expand Down Expand Up @@ -66,7 +67,7 @@ func TestFromAutomationConfig(t *testing.T) {
ClusterPassword: "ClusterPassword",
CRLFile: "CRLFile",
DisabledProtocols: "DisabledProtocols",
FIPSMode: "FIPSMode",
FIPSMode: &fipsMode,
Mode: "Mode",
PEMKeyFile: "PEMKeyFile",
},
Expand Down
9 changes: 5 additions & 4 deletions internal/convert/cluster_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
)

func TestClusterConfig_PatchAutomationConfig(t *testing.T) {
fipsMode := true
testCases := map[string]struct {
current *opsmngr.AutomationConfig
expected *opsmngr.AutomationConfig
Expand Down Expand Up @@ -133,7 +134,7 @@ func TestClusterConfig_PatchAutomationConfig(t *testing.T) {
ClusterPassword: "ClusterPassword",
CRLFile: "CRLFile",
DisabledProtocols: "DisabledProtocols",
FIPSMode: "FIPSMode",
FIPSMode: &fipsMode,
Mode: "Mode",
PEMKeyFile: "PEMKeyFile",
},
Expand Down Expand Up @@ -163,7 +164,7 @@ func TestClusterConfig_PatchAutomationConfig(t *testing.T) {
ClusterPassword: "ClusterPassword",
CRLFile: "CRLFile",
DisabledProtocols: "DisabledProtocols",
FIPSMode: "FIPSMode",
FIPSMode: &fipsMode,
Mode: "Mode",
PEMKeyFile: "PEMKeyFile",
},
Expand Down Expand Up @@ -215,7 +216,7 @@ func TestClusterConfig_PatchAutomationConfig(t *testing.T) {
ClusterPassword: "ClusterPassword",
CRLFile: "CRLFile",
DisabledProtocols: "DisabledProtocols",
FIPSMode: "FIPSMode",
FIPSMode: &fipsMode,
Mode: "Mode",
PEMKeyFile: "PEMKeyFile",
},
Expand Down Expand Up @@ -450,7 +451,7 @@ func TestClusterConfig_PatchAutomationConfig(t *testing.T) {
ClusterPassword: "ClusterPassword",
CRLFile: "CRLFile",
DisabledProtocols: "DisabledProtocols",
FIPSMode: "FIPSMode",
FIPSMode: &fipsMode,
Mode: "Mode",
PEMKeyFile: "PEMKeyFile",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/convert/process_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ type TLS struct {
ClusterPassword string `yaml:"clusterPassword,omitempty" json:"clusterPassword,omitempty"`
CRLFile string `yaml:"CRLFile,omitempty" json:"CRLFile,omitempty"`
DisabledProtocols string `yaml:"disabledProtocols,omitempty" json:"disabledProtocols,omitempty"`
FIPSMode string `yaml:"FIPSMode,omitempty" json:"FIPSMode,omitempty"`
FIPSMode *bool `yaml:"FIPSMode,omitempty" json:"FIPSMode,omitempty"`
Mode string `yaml:"mode,omitempty" json:"mode,omitempty"`
PEMKeyFile string `yaml:"PEMKeyFile,omitempty" json:"PEMKeyFile,omitempty"`
}
Expand Down
11 changes: 9 additions & 2 deletions internal/convert/process_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

func Test_newReplicaSetProcessConfig(t *testing.T) {
var slaveDelay float64
fipsMode := true
omp := &opsmngr.Process{
Args26: opsmngr.Args26{
AuditLog: &opsmngr.AuditLog{
Expand All @@ -37,7 +38,10 @@ func Test_newReplicaSetProcessConfig(t *testing.T) {
},
NET: opsmngr.Net{
Port: 27017,
TLS: &opsmngr.TLS{Mode: "disabled"},
TLS: &opsmngr.TLS{
Mode: "disabled",
FIPSMode: &fipsMode,
},
},
Replication: &opsmngr.Replication{
ReplSetName: "myReplicaSet",
Expand Down Expand Up @@ -111,7 +115,10 @@ func Test_newReplicaSetProcessConfig(t *testing.T) {
ArbiterOnly: pointy.Bool(false),
Disabled: false,
Hidden: pointy.Bool(false),
TLS: &TLS{Mode: "disabled"},
TLS: &TLS{
Mode: "disabled",
FIPSMode: &fipsMode,
},
SetParameter: &map[string]interface{}{
"param": "param",
},
Expand Down
3 changes: 2 additions & 1 deletion internal/test/fixture/automation_configs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ func AutomationConfigWithMonitoring() *opsmngr.AutomationConfig {
}

func AutomationConfigWithOneReplicaSet(name string, disabled bool) *opsmngr.AutomationConfig {
fipsMode := true
return &opsmngr.AutomationConfig{
Processes: []*opsmngr.Process{
{
Expand All @@ -206,7 +207,7 @@ func AutomationConfigWithOneReplicaSet(name string, disabled bool) *opsmngr.Auto
ClusterPassword: "ClusterPassword",
CRLFile: "CRLFile",
DisabledProtocols: "DisabledProtocols",
FIPSMode: "FIPSMode",
FIPSMode: &fipsMode,
Mode: "Mode",
PEMKeyFile: "PEMKeyFile",
},
Expand Down