Skip to content

Commit

Permalink
Revert "Adding build constraints (microsoft#1340)"
Browse files Browse the repository at this point in the history
This reverts commit 949e46a.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
  • Loading branch information
dcantah committed May 11, 2022
1 parent 2940aa7 commit e8e7652
Show file tree
Hide file tree
Showing 612 changed files with 262 additions and 1,220 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ clean:
rm -rf bin deps rootfs out

test:
cd $(SRCROOT) && $(GO) test -v ./internal/guest/...
cd $(SRCROOT) && go test -v ./internal/guest/...

rootfs: out/rootfs.vhd

Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/clone.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/delete.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/events.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/events_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import "context"
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/exec.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/exec_clone.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/exec_hcs.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/exec_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/exec_wcow_podsandbox.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/exec_wcow_podsandbox_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/main.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/pod.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/pod_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/serve.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/service.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/service_internal.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down Expand Up @@ -611,7 +609,7 @@ func Test_TaskShim_waitInternal_InitTaskID_2ndExecID_Success(t *testing.T) {
}
}

func Test_TaskShim_statsInternal_InitTaskID_Success(t *testing.T) {
func Test_TaskShim_statsInternal_InitTaskID_Sucess(t *testing.T) {
testNames := []string{"WCOW", "LCOW"}
for i, isWCOW := range []bool{true, false} {
t.Run(testNames[i], func(t *testing.T) {
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/service_internal_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/start.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/task.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/task_hcs.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/task_hcs_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/task_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/containerd-shim-runhcs-v1/task_wcow_podsandbox.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/device-util/main.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/jobobject-util/main.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
3 changes: 1 addition & 2 deletions cmd/ncproxy/computeagent_cache.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down Expand Up @@ -40,6 +38,7 @@ func (c *computeAgentCache) getAllAndClear() ([]*computeAgentClient, error) {
results = append(results, agent)
}
return results, nil

}

func (c *computeAgentCache) get(cid string) (*computeAgentClient, error) {
Expand Down
2 changes: 0 additions & 2 deletions cmd/ncproxy/config.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/ncproxy/hcn.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/ncproxy/hcn_networking_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/ncproxy/main.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
3 changes: 1 addition & 2 deletions cmd/ncproxy/ncproxy.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down Expand Up @@ -155,6 +153,7 @@ func (s *grpcService) AddNIC(ctx context.Context, req *ncproxygrpc.AddNICRequest
return nil, err
}
return &ncproxygrpc.AddNICResponse{}, nil

}

func (s *grpcService) ModifyNIC(ctx context.Context, req *ncproxygrpc.ModifyNICRequest) (_ *ncproxygrpc.ModifyNICResponse, err error) {
Expand Down
2 changes: 0 additions & 2 deletions cmd/ncproxy/ncproxy_networking_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/ncproxy/run.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/ncproxy/server.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/ncproxy/server_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/ncproxy/service.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 2 additions & 0 deletions cmd/ncproxy/utilities_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ func networkExists(targetName string, networks []*ncproxygrpc.GetNetworkResponse
return true
}
}

}
return false
}
Expand All @@ -49,6 +50,7 @@ func endpointExists(targetName string, endpoints []*ncproxygrpc.GetEndpointRespo
return true
}
}

}
return false
}
Expand Down
3 changes: 1 addition & 2 deletions cmd/remotevm-util/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ var launchVMCommand = cli.Command{
},
},
Action: func(clictx *cli.Context) error {
// Precomputed default kernel args that are used for LCOW. We can use the same.
kernelArgs := `panic=-1 root=/dev/foo debug noapic pci=off`
kernelArgs := `8250_core.nr_uarts=0 panic=-1 quiet pci=off brd.rd_nr=0 pmtmr=0 -- -e 1 /bin/vsockexec -e 109 /bin/gcs -v4 -log-format json -loglevel debug`
ctx := context.Background()
builder, err := remotevm.NewUVMBuilder(
ctx,
Expand Down
8 changes: 3 additions & 5 deletions cmd/runhcs/container.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down Expand Up @@ -38,7 +36,7 @@ type persistedState struct {
ID string `json:",omitempty"`
// Owner is the owner value passed into the runhcs command and may be `""`.
Owner string `json:",omitempty"`
// SandboxID is the sandbox identifier passed in via OCI specifications. This
// SandboxID is the sandbox identifer passed in via OCI specifications. This
// can either be the sandbox itself or the sandbox this container should run
// in. See `parseSandboxAnnotations`.
SandboxID string `json:",omitempty"`
Expand Down Expand Up @@ -205,8 +203,8 @@ func launchShim(cmd, pidFile, logFile string, args []string, data interface{}) (
// different runtimes to represent a sandbox ID, and sandbox type.
//
// If found returns the tuple `(sandboxID, isSandbox)` where `isSandbox == true`
// indicates the identifier is the sandbox itself; `isSandbox == false` indicates
// the identifier is the sandbox in which to place this container. Otherwise
// indicates the identifer is the sandbox itself; `isSandbox == false` indicates
// the identifer is the sandbox in which to place this container. Otherwise
// returns `("", false)`.
func parseSandboxAnnotations(a map[string]string) (string, bool) {
var t, id string
Expand Down
2 changes: 0 additions & 2 deletions cmd/runhcs/create-scratch.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/runhcs/create.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/runhcs/delete.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/runhcs/exec.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/runhcs/kill.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/runhcs/list.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/runhcs/main.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/runhcs/pause.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/runhcs/prepare-disk.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/runhcs/ps.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/runhcs/run.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/runhcs/shim.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/runhcs/spec.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
2 changes: 0 additions & 2 deletions cmd/runhcs/start.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build windows

package main

import (
Expand Down
Loading

0 comments on commit e8e7652

Please sign in to comment.