Skip to content

Commit 6f2a97e

Browse files
fix: errors due to package restructure conflicts with upstream
Signed-off-by: SohamRatnaparkhi <[email protected]>
1 parent 7ee8b97 commit 6f2a97e

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"github.com/google/uuid"
1111
"github.com/litmuschaos/litmus/chaoscenter/graphql/server/graph/model"
1212
"github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/authorization"
13-
types "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/chaos_experiment"
1413
choasExperimentMocks "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/chaos_experiment/model/mocks"
14+
types "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/chaos_experiment/ops"
1515
"github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/chaos_infrastructure"
1616
chaosInfraMocks "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/chaos_infrastructure/model/mocks"
1717
chaosExperimentRun "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/choas_experiment_run"

chaoscenter/graphql/server/pkg/chaos_experiment/ops/service.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ import (
88
"strings"
99
"time"
1010

11-
chaosTypes "github.com/litmuschaos/chaos-operator/api/litmuschaos/v1alpha1"
12-
"github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/probe"
13-
1411
"github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/chaos_infrastructure"
1512

1613
"github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb"
@@ -29,7 +26,7 @@ import (
2926
"github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
3027
"github.com/ghodss/yaml"
3128
"github.com/google/uuid"
32-
29+
chaosTypes "github.com/litmuschaos/chaos-operator/api/litmuschaos/v1alpha1"
3330
scheduleTypes "github.com/litmuschaos/chaos-scheduler/api/litmuschaos/v1alpha1"
3431
"go.mongodb.org/mongo-driver/bson"
3532
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -150,12 +147,6 @@ func (c *chaosExperimentService) ProcessExperimentCreation(ctx context.Context,
150147
weightages []*dbChaosExperiment.WeightagesInput
151148
revision []dbChaosExperiment.ExperimentRevision
152149
)
153-
154-
probes, err := probe.ParseProbesFromManifest(wfType, input.ExperimentManifest)
155-
if err != nil {
156-
return err
157-
}
158-
159150
if input.Weightages != nil {
160151
//TODO: Once we make the new chaos terminology change in APIs, then we can we the copier instead of for loop
161152
for _, v := range input.Weightages {
@@ -173,7 +164,6 @@ func (c *chaosExperimentService) ProcessExperimentCreation(ctx context.Context,
173164
ExperimentManifest: input.ExperimentManifest,
174165
UpdatedAt: timeNow,
175166
Weightages: weightages,
176-
Probes: probes,
177167
})
178168

179169
newChaosExperiment := dbChaosExperiment.ChaosExperimentRequest{
@@ -199,7 +189,7 @@ func (c *chaosExperimentService) ProcessExperimentCreation(ctx context.Context,
199189
RecentExperimentRunDetails: []dbChaosExperiment.ExperimentRunDetail{},
200190
}
201191

202-
err = c.chaosExperimentOperator.InsertChaosExperiment(ctx, newChaosExperiment)
192+
err := c.chaosExperimentOperator.InsertChaosExperiment(ctx, newChaosExperiment)
203193
if err != nil {
204194
return err
205195
}

chaoscenter/graphql/server/pkg/chaos_experiment/service_test.go renamed to chaoscenter/graphql/server/pkg/chaos_experiment/ops/service_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package chaos_experiment
1+
package ops
22

33
import (
44
"context"
@@ -90,7 +90,7 @@ func Test_chaosExperimentService_ProcessExperiment(t *testing.T) {
9090
projectID := uuid.NewString()
9191
revID := uuid.NewString()
9292

93-
commonPath := "./model/mocks/"
93+
commonPath := "../model/mocks/"
9494
yamlTypeMap := map[string]string{
9595
"workflow": commonPath + "workflow.yaml",
9696
"cron_workflow": commonPath + "cron_workflow.yaml",

0 commit comments

Comments
 (0)