Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-07-29 01:58:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix error that occured in e2e test

Browse source
This commit is contained in:
katexochen 2022-04-26 13:22:57 +02:00 • committed by Paul Meyer
parent 1317fc2bb2
commit d5c7bb6078
3 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
cli/gcp/client/network.go
View file

@ -124,7 +124,7 @@ func (c *Client) TerminateVPCs(ctx context.Context) error {
return errors.New("client has firewalls, which must be deleted first")
}
if err := c.terminateSubnets(ctx); err != nil {
if err := c.terminateSubnet(ctx); err != nil {
return err
}
@ -183,23 +183,18 @@ func (c *Client) createSubnet(ctx context.Context, name, cidr, network, secondar
return c.subnetworksAPI.Insert(ctx, req)
}
func (c *Client) terminateSubnets(ctx context.Context) error {
var op Operation
var err error
if c.subnetwork != "" {
op, err = c.terminateSubnet(ctx, c.subnetwork)
if err != nil {
return err
}
func (c *Client) terminateSubnet(ctx context.Context) error {
if c.subnetwork == "" {
return nil
}
return c.waitForOperations(ctx, []Operation{op})
}
func (c *Client) terminateSubnet(ctx context.Context, name string) (Operation, error) {
req := &computepb.DeleteSubnetworkRequest{
Project: c.project,
Region: c.region,
Subnetwork: name,
Subnetwork: c.subnetwork,
}
return c.subnetworksAPI.Delete(ctx, req)
op, err := c.subnetworksAPI.Delete(ctx, req)
if err != nil {
return err
}
return c.waitForOperations(ctx, []Operation{op})
}