Skip to content

Commit 0cf936b

Browse files
josvazgjosvazg
authored
Revert "CLOUDP-192880: Make clean CLI tool (#1149)" (#1153)
This reverts commit 59ecd70.
1 parent 59ecd70 commit 0cf936b

File tree

29 files changed

+665
-127
lines changed

29 files changed

+665
-127
lines changed

tools/clean/vpc/azure.go renamed to .github/actions/clean-vpc/azure.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package vpc
1+
package main
22

33
import (
44
"context"

tools/clean/vpc/gcp.go renamed to .github/actions/clean-vpc/gcp.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package vpc
1+
package main
22

33
import (
44
"context"

‎.github/actions/clean-vpc/go.mod‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
module actions/cleanup-vpc
2+
3+
go 1.21
4+
5+
require (
6+
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
7+
github.com/Azure/go-autorest/autorest/azure/auth v0.5.12
8+
google.golang.org/api v0.125.0
9+
)
10+
11+
require (
12+
cloud.google.com/go/compute v1.19.3 // indirect
13+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
14+
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
15+
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
16+
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
17+
github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 // indirect
18+
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
19+
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
20+
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
21+
github.com/Azure/go-autorest/logger v0.2.1 // indirect
22+
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
23+
github.com/dimchansky/utfbom v1.1.1 // indirect
24+
github.com/golang-jwt/jwt/v4 v4.3.0 // indirect
25+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
26+
github.com/golang/protobuf v1.5.3 // indirect
27+
github.com/google/s2a-go v0.1.4 // indirect
28+
github.com/google/uuid v1.3.0 // indirect
29+
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
30+
github.com/googleapis/gax-go/v2 v2.10.0 // indirect
31+
github.com/mitchellh/go-homedir v1.1.0 // indirect
32+
go.opencensus.io v0.24.0 // indirect
33+
golang.org/x/crypto v0.9.0 // indirect
34+
golang.org/x/net v0.10.0 // indirect
35+
golang.org/x/oauth2 v0.8.0 // indirect
36+
golang.org/x/sys v0.8.0 // indirect
37+
golang.org/x/text v0.9.0 // indirect
38+
google.golang.org/appengine v1.6.7 // indirect
39+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
40+
google.golang.org/grpc v1.55.0 // indirect
41+
google.golang.org/protobuf v1.30.0 // indirect
42+
)

‎.github/actions/clean-vpc/go.sum‎

Lines changed: 234 additions & 0 deletions
Large diffs are not rendered by default.

tools/clean/vpc/vpc.go renamed to .github/actions/clean-vpc/main.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package vpc
1+
package main
22

33
import (
44
"context"
55
"errors"
6+
"fmt"
67
"log"
78
"os"
89
)
@@ -14,7 +15,7 @@ const (
1415
azureVPCName = "test-vnet"
1516
)
1617

17-
func CleanVPCs() {
18+
func main() {
1819
err := setGCPCredentials()
1920
if err != nil {
2021
log.Fatal(err)
@@ -42,10 +43,9 @@ func CleanVPCs() {
4243
log.Println("Not all Azure VPC was deleted")
4344
}
4445
if allErr != nil {
45-
log.Println("ERRORS: ", allErr)
46+
fmt.Println("ERRORS: ", allErr)
4647
}
4748
if !azureOk || !gcpOk {
4849
os.Exit(1)
4950
}
50-
log.Printf("VPC cleanups completed OK")
5151
}

tools/clean/pe/cleanall.go renamed to .github/actions/cleanup-pe/cleanall.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package pe
1+
package main
22

33
import (
44
"context"

‎.github/actions/cleanup-pe/go.mod‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
module actions/cleanup-pe
2+
3+
go 1.21
4+
5+
require (
6+
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
7+
github.com/Azure/go-autorest/autorest/azure/auth v0.5.12
8+
github.com/aws/aws-sdk-go v1.44.274
9+
google.golang.org/api v0.125.0
10+
)
11+
12+
require (
13+
cloud.google.com/go/compute v1.19.3 // indirect
14+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
15+
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
16+
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
17+
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
18+
github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 // indirect
19+
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
20+
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
21+
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
22+
github.com/Azure/go-autorest/logger v0.2.1 // indirect
23+
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
24+
github.com/dimchansky/utfbom v1.1.1 // indirect
25+
github.com/golang-jwt/jwt/v4 v4.3.0 // indirect
26+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
27+
github.com/golang/protobuf v1.5.3 // indirect
28+
github.com/google/s2a-go v0.1.4 // indirect
29+
github.com/google/uuid v1.3.0 // indirect
30+
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
31+
github.com/googleapis/gax-go/v2 v2.10.0 // indirect
32+
github.com/jmespath/go-jmespath v0.4.0 // indirect
33+
github.com/mitchellh/go-homedir v1.1.0 // indirect
34+
go.opencensus.io v0.24.0 // indirect
35+
golang.org/x/crypto v0.9.0 // indirect
36+
golang.org/x/net v0.10.0 // indirect
37+
golang.org/x/oauth2 v0.8.0 // indirect
38+
golang.org/x/sys v0.8.0 // indirect
39+
golang.org/x/text v0.9.0 // indirect
40+
google.golang.org/appengine v1.6.7 // indirect
41+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
42+
google.golang.org/grpc v1.55.0 // indirect
43+
google.golang.org/protobuf v1.30.0 // indirect
44+
gopkg.in/yaml.v2 v2.4.0 // indirect
45+
)

0 commit comments

Comments
 (0)