Commit743e3b8

committed

had to remove without state converter

The graph is required for daily cost information

1 parentd3850bb commit743e3b8Copy full SHA for 743e3b8

File tree

-55

lines changed

-55

lines changed

Lines changed: 0 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,27 +24,6 @@ import (`
`24`	`24`	`"github.com/coder/coder/v2/provisionersdk/proto"`
`25`	`25`	`)`
`26`	`26`
`27`		`-typeReducedStatestruct {`
`28`		`-Resources []*proto.Resource`
`29`		`-}`
`30`		`-`
`31`		`-funcConvertStateWithoutGraph(ctx context.Context,modules []tfjson.StateModule,logger slog.Logger) (ReducedState,error) {`
`32`		`-converter:=newConverter(ctx,logger,gographviz.NewGraph())`
`33`		`-`
`34`		`-// Index all resources from the state.`
`35`		`-converter.indexTerraformResources(modules)`
`36`		`-`
`37`		`-// Associate agent instance IDs.`
`38`		`-converter.processAgentInstances()`
`39`		`-`
`40`		`-// Build the final resource list.`
`41`		`-converter.buildResources()`
`42`		`-`
`43`		`-return&ReducedState{`
`44`		`-Resources:converter.resources,`
`45`		`-},nil`
`46`		`-}`
`47`		`-`
`48`	`27`	`// ConvertState consumes Terraform state and a GraphViz representation`
`49`	`28`	// produced by `terraform graph` to produce resources consumable by Coder.
`50`	`29`	`funcConvertState(ctx context.Context,modules []tfjson.StateModule,rawGraphstring,logger slog.Logger) (State,error) {`

Lines changed: 0 additions & 34 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,40 +128,6 @@ func TestConvertStateGolden(t *testing.T) {`
`128`	`128`	`require.NoError(t,err)`
`129`	`129`
`130`	`130`	`require.JSONEq(t,string(expBytes),string(gotBytes),"converted state")`
`131`		`-`
`132`		`-ifexpectedState,ok:=expectedOutput.(*terraform.State);ok {`
`133`		`-t.Run("WithoutGraph",func(t*testing.T) {`
`134`		`-gotState,err:=terraform.ConvertStateWithoutGraph(ctx,modules,logger)`
`135`		`-require.NoError(t,err)`
`136`		`-sortResources(gotState.Resources)`
`137`		`-`
`138`		`-for_,res:=rangeexpectedState.Resources {`
`139`		`-// Agents will not exist without the graph.`
`140`		`-original:=res.Agents`
`141`		`-t.Cleanup(func() {`
`142`		`-res.Agents=original`
`143`		`-})`
`144`		`-res.Agents=nil`
`145`		`-`
`146`		`-// Metadata will not exist without the graph.`
`147`		`-originalMetadata:=res.Metadata`
`148`		`-t.Cleanup(func() {`
`149`		`-res.Metadata=originalMetadata`
`150`		`-})`
`151`		`-res.Metadata=nil`
`152`		`-}`
`153`		`-`
`154`		`-require.Equal(t,len(expectedState.Resources),len(gotState.Resources),"number of resources")`
`155`		`-fori:=rangegotState.Resources {`
`156`		`-got,err:=json.Marshal(gotState.Resources[i])`
`157`		`-require.NoError(t,err,"marshaling got resource to JSON")`
`158`		`-expected,err:=json.Marshal(expectedState.Resources[i])`
`159`		`-require.NoError(t,err,"marshaling expected resource to JSON")`
`160`		`-`
`161`		`-require.JSONEq(t,string(expected),string(got),"json cmp")`
`162`		`-}`
`163`		`-})`
`164`		`-}`
`165`	`131`	`})`
`166`	`132`	`}`
`167`	`133`	`}`

Comments

(0)