Skip to content

Commit a339ab0

Browse files
spencerugbospencerugbo
committed
rename manifest helper function
1 parent db8c825 commit a339ab0

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

‎api/grpc/mpi/v1/command_grpc.pb.go‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/grpc/mpi/v1/files_grpc.pb.go‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/integration/managementplane/config_apply_unreferenced_files_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func (s *ConfigApplyUnreferencedFilesTestSuite) TestConfigApply_Test1_TestSubDir
7979
responses := utils.ManagementPlaneResponses(s.T(), 2, utils.MockManagementPlaneAPIAddress)
8080
s.T().Logf("Config apply responses: %v", responses)
8181

82-
manifestFiles := utils.GetManifestFiles()
82+
manifestFiles := utils.ManifestFiles()
8383
manifestFiles["/etc/nginx/test/unreferenced_file.conf"] = &model.ManifestFile{
8484
ManifestFileMeta: &model.ManifestFileMeta{
8585
Name: "/etc/nginx/test/unreferenced_file.conf",
@@ -137,7 +137,7 @@ func (s *ConfigApplyUnreferencedFilesTestSuite) TestConfigApply_Test2_TestUpdate
137137
responses := utils.ManagementPlaneResponses(s.T(), 1, utils.MockManagementPlaneAPIAddress)
138138
s.T().Logf("Config apply responses: %v", responses)
139139

140-
manifestFiles := utils.GetManifestFiles()
140+
manifestFiles := utils.ManifestFiles()
141141

142142
if os.Getenv("IMAGE_PATH") == "/nginx-plus/agent" {
143143
manifestFiles["/etc/nginx/nginx.conf"].ManifestFileMeta.Hash = "/SWXYYenb2EcJNg6fiuzlkdj91nBdsMdF1vLm7Wybvc="
@@ -175,7 +175,7 @@ func (s *ConfigApplyUnreferencedFilesTestSuite) TestConfigApply_Test3_TestDelete
175175
responses := utils.ManagementPlaneResponses(s.T(), 1, utils.MockManagementPlaneAPIAddress)
176176
s.T().Logf("Config apply responses: %v", responses)
177177

178-
manifestFiles := utils.GetManifestFiles()
178+
manifestFiles := utils.ManifestFiles()
179179

180180
if os.Getenv("IMAGE_PATH") == "/nginx-plus/agent" {
181181
manifestFiles["/etc/nginx/nginx.conf"].ManifestFileMeta.Hash = "/SWXYYenb2EcJNg6fiuzlkdj91nBdsMdF1vLm7Wybvc="
@@ -211,7 +211,7 @@ func (s *ConfigApplyUnreferencedFilesTestSuite) TestConfigApply_Test4_TestDelete
211211
responses := utils.ManagementPlaneResponses(s.T(), 1, utils.MockManagementPlaneAPIAddress)
212212
s.T().Logf("Config apply responses: %v", responses)
213213

214-
manifestFiles := utils.GetManifestFiles()
214+
manifestFiles := utils.ManifestFiles()
215215
delete(manifestFiles, "/etc/nginx/test/unreferenced_file.conf")
216216

217217
if os.Getenv("IMAGE_PATH") == "/nginx-plus/agent" {
@@ -261,7 +261,7 @@ func (s *ConfigApplyUnreferencedFilesTestSuite) TestConfigApply_Test5_TestUnrefe
261261
s.Equal(mpi.CommandResponse_COMMAND_STATUS_OK, responses[0].GetCommandResponse().GetStatus())
262262
s.Equal("Config apply successful", responses[0].GetCommandResponse().GetMessage())
263263

264-
manifestFiles := utils.GetManifestFiles()
264+
manifestFiles := utils.ManifestFiles()
265265
manifestFiles["/etc/nginx/test/unreferenced_file.conf"] = &model.ManifestFile{
266266
ManifestFileMeta: &model.ManifestFileMeta{
267267
Name: "/etc/nginx/test/unreferenced_file.conf",
@@ -301,7 +301,7 @@ func (s *ConfigApplyUnreferencedFilesTestSuite) TestConfigApply_Test5_TestUnrefe
301301
func (s *ConfigApplyUnreferencedFilesTestSuite) TestConfigApply_Test6_TestReferencedToUnreferenced() {
302302
slog.Info("starting referenced file to unreferenced file test")
303303

304-
manifestFiles := utils.GetManifestFiles()
304+
manifestFiles := utils.ManifestFiles()
305305

306306
utils.CheckManifestFile(s.T(), utils.Container, manifestFiles)
307307
utils.WriteConfigFileMock(s.T(), s.nginxInstanceID, "/etc/nginx/mime.types",
@@ -358,7 +358,7 @@ func (s *ConfigApplyUnreferencedFilesTestSuite) TestConfigApply_Test7_TestRollba
358358
responses := utils.ManagementPlaneResponses(s.T(), 2, utils.MockManagementPlaneAPIAddress)
359359
s.T().Logf("Config apply responses: %v", responses)
360360

361-
manifestFiles := utils.GetManifestFiles()
361+
manifestFiles := utils.ManifestFiles()
362362

363363
utils.CheckManifestFile(s.T(), utils.Container, manifestFiles)
364364

‎test/integration/utils/config_apply_utils.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const (
3838
var (
3939
MockManagementPlaneAPIAddress string
4040
AuxiliaryMockManagementPlaneAPIAddress string
41-
ManifestFiles map[string]*model.ManifestFile
41+
mockManifestFiles map[string]*model.ManifestFile
4242
)
4343

4444
func PerformConfigApply(t *testing.T, nginxInstanceID, mockManagementPlaneAPIAddress string) {
@@ -171,12 +171,12 @@ func CheckManifestFile(t *testing.T, container testcontainers.Container,
171171
assert.Equal(t, expectedContent, manifestFiles)
172172
}
173173

174-
func GetManifestFiles() map[string]*model.ManifestFile {
174+
func ManifestFiles() map[string]*model.ManifestFile {
175175
nginxConfSize := 1172
176176
mimeTypeSize := 5349
177177

178-
if len(ManifestFiles) == 0 {
179-
ManifestFiles = map[string]*model.ManifestFile{
178+
if len(mockManifestFiles) == 0 {
179+
mockManifestFiles = map[string]*model.ManifestFile{
180180
"/etc/nginx/mime.types": {
181181
ManifestFileMeta: &model.ManifestFileMeta{
182182
Name: "/etc/nginx/mime.types",
@@ -196,7 +196,7 @@ func GetManifestFiles() map[string]*model.ManifestFile {
196196
}
197197
}
198198

199-
return ManifestFiles
199+
return mockManifestFiles
200200
}
201201

202202
func WriteConfigFileMock(t *testing.T, nginxInstanceID, file1, file2, file3 string) {

0 commit comments

Comments
 (0)