diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..94f480de94 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf \ No newline at end of file diff --git a/CODEOWNERS b/CODEOWNERS index 1a59c8021d..87f49df314 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,3 +1,3 @@ -* @microsoft/containerplat - +* @microsoft/containerplat + /hcn/* @nagiesek \ No newline at end of file diff --git a/internal/schema2/cpu_group_operations.go b/internal/schema2/cpu_group_operations.go index 195557cfe0..7d89780701 100644 --- a/internal/schema2/cpu_group_operations.go +++ b/internal/schema2/cpu_group_operations.go @@ -1,18 +1,18 @@ -/* - * HCS API - * - * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) - * - * API version: 2.4 - * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) - */ - -package hcsschema - -type CPUGroupOperation string - -const ( - CreateGroup CPUGroupOperation = "CreateGroup" - DeleteGroup CPUGroupOperation = "DeleteGroup" - SetProperty CPUGroupOperation = "SetProperty" -) +/* + * HCS API + * + * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) + * + * API version: 2.4 + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package hcsschema + +type CPUGroupOperation string + +const ( + CreateGroup CPUGroupOperation = "CreateGroup" + DeleteGroup CPUGroupOperation = "DeleteGroup" + SetProperty CPUGroupOperation = "SetProperty" +) diff --git a/test/testdata/pullimage/Dockerfile b/test/testdata/pullimage/Dockerfile index 0f1e867ac7..6294e53ec0 100644 --- a/test/testdata/pullimage/Dockerfile +++ b/test/testdata/pullimage/Dockerfile @@ -1,23 +1,23 @@ -# This Dockerfile builds a docker image based on top of the nanoserver image that is -# used during the pull image tests in hcsshim. Tests in hcsshim/test/pullimage_test.go -# are directly dependent on the directory structure of this image. If anything is changed -# in this Dockerfile, please make sure to update the tests too. - -# As of now this image is built with: -# `docker build -t mtbar131/hcsshim:nanoserver_test .` -# And this image is pushed to a private repo with: -# `docker push mtbar131/hcsshim:nanoserver_test` - -# Base image -FROM mcr.microsoft.com/windows/nanoserver:1909 -# Get administrator privileges -USER containeradministrator - -# Create a fake symlink - This will act likea BUGCHECK if our layer import code tries to -# follow such symlinks. -RUN mklink /d C:\Users\Public\fakelink C:\abcd -# Create a directory and a file inside that directory. This file will be deleted in the next -# layer. The tests verify that even after file deletion in a layer timestamps are updated -# correcty. -RUN mkdir C:\Users\Public\testdir && echo "Windows Layer timestamp test" > C:\Users\Public\testdir\test.txt +# This Dockerfile builds a docker image based on top of the nanoserver image that is +# used during the pull image tests in hcsshim. Tests in hcsshim/test/pullimage_test.go +# are directly dependent on the directory structure of this image. If anything is changed +# in this Dockerfile, please make sure to update the tests too. + +# As of now this image is built with: +# `docker build -t mtbar131/hcsshim:nanoserver_test .` +# And this image is pushed to a private repo with: +# `docker push mtbar131/hcsshim:nanoserver_test` + +# Base image +FROM mcr.microsoft.com/windows/nanoserver:1909 +# Get administrator privileges +USER containeradministrator + +# Create a fake symlink - This will act likea BUGCHECK if our layer import code tries to +# follow such symlinks. +RUN mklink /d C:\Users\Public\fakelink C:\abcd +# Create a directory and a file inside that directory. This file will be deleted in the next +# layer. The tests verify that even after file deletion in a layer timestamps are updated +# correcty. +RUN mkdir C:\Users\Public\testdir && echo "Windows Layer timestamp test" > C:\Users\Public\testdir\test.txt RUN del /q C:\Users\Public\testdir\test.txt \ No newline at end of file diff --git a/test/vendor/github.com/Microsoft/hcsshim/CODEOWNERS b/test/vendor/github.com/Microsoft/hcsshim/CODEOWNERS index 1a59c8021d..87f49df314 100644 --- a/test/vendor/github.com/Microsoft/hcsshim/CODEOWNERS +++ b/test/vendor/github.com/Microsoft/hcsshim/CODEOWNERS @@ -1,3 +1,3 @@ -* @microsoft/containerplat - +* @microsoft/containerplat + /hcn/* @nagiesek \ No newline at end of file diff --git a/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/next.pb.txt b/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/next.pb.txt index fee15d6b5c..a02635a082 100644 --- a/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/next.pb.txt +++ b/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/next.pb.txt @@ -1,207 +1,207 @@ -file { - name: "google/protobuf/timestamp.proto" - package: "google.protobuf" - message_type { - name: "Timestamp" - field { - name: "seconds" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_INT64 - json_name: "seconds" - } - field { - name: "nanos" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_INT32 - json_name: "nanos" - } - } - options { - java_package: "com.google.protobuf" - java_outer_classname: "TimestampProto" - java_multiple_files: true - go_package: "github.com/golang/protobuf/ptypes/timestamp" - cc_enable_arenas: true - objc_class_prefix: "GPB" - csharp_namespace: "Google.Protobuf.WellKnownTypes" - } - syntax: "proto3" -} -file { - name: "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto" - package: "containerd.runhcs.v1" - dependency: "gogoproto/gogo.proto" - dependency: "google/protobuf/timestamp.proto" - message_type { - name: "Options" - field { - name: "debug" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_BOOL - json_name: "debug" - } - field { - name: "debug_type" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_ENUM - type_name: ".containerd.runhcs.v1.Options.DebugType" - json_name: "debugType" - } - field { - name: "registry_root" - number: 3 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "registryRoot" - } - field { - name: "sandbox_image" - number: 4 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "sandboxImage" - } - field { - name: "sandbox_platform" - number: 5 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "sandboxPlatform" - } - field { - name: "sandbox_isolation" - number: 6 - label: LABEL_OPTIONAL - type: TYPE_ENUM - type_name: ".containerd.runhcs.v1.Options.SandboxIsolation" - json_name: "sandboxIsolation" - } - field { - name: "boot_files_root_path" - number: 7 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "bootFilesRootPath" - } - field { - name: "vm_processor_count" - number: 8 - label: LABEL_OPTIONAL - type: TYPE_INT32 - json_name: "vmProcessorCount" - } - field { - name: "vm_memory_size_in_mb" - number: 9 - label: LABEL_OPTIONAL - type: TYPE_INT32 - json_name: "vmMemorySizeInMb" - } - enum_type { - name: "DebugType" - value { - name: "NPIPE" - number: 0 - } - value { - name: "FILE" - number: 1 - } - value { - name: "ETW" - number: 2 - } - } - enum_type { - name: "SandboxIsolation" - value { - name: "PROCESS" - number: 0 - } - value { - name: "HYPERVISOR" - number: 1 - } - } - } - message_type { - name: "ProcessDetails" - field { - name: "image_name" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "imageName" - } - field { - name: "created_at" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".google.protobuf.Timestamp" - options { - 65001: 0 - 65010: 1 - } - json_name: "createdAt" - } - field { - name: "kernel_time_100_ns" - number: 3 - label: LABEL_OPTIONAL - type: TYPE_UINT64 - json_name: "kernelTime100Ns" - } - field { - name: "memory_commit_bytes" - number: 4 - label: LABEL_OPTIONAL - type: TYPE_UINT64 - json_name: "memoryCommitBytes" - } - field { - name: "memory_working_set_private_bytes" - number: 5 - label: LABEL_OPTIONAL - type: TYPE_UINT64 - json_name: "memoryWorkingSetPrivateBytes" - } - field { - name: "memory_working_set_shared_bytes" - number: 6 - label: LABEL_OPTIONAL - type: TYPE_UINT64 - json_name: "memoryWorkingSetSharedBytes" - } - field { - name: "process_id" - number: 7 - label: LABEL_OPTIONAL - type: TYPE_UINT32 - json_name: "processId" - } - field { - name: "user_time_100_ns" - number: 8 - label: LABEL_OPTIONAL - type: TYPE_UINT64 - json_name: "userTime100Ns" - } - field { - name: "exec_id" - number: 9 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "execId" - } - } - options { - go_package: "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options;options" - } - weak_dependency: 0 - syntax: "proto3" +file { + name: "google/protobuf/timestamp.proto" + package: "google.protobuf" + message_type { + name: "Timestamp" + field { + name: "seconds" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_INT64 + json_name: "seconds" + } + field { + name: "nanos" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_INT32 + json_name: "nanos" + } + } + options { + java_package: "com.google.protobuf" + java_outer_classname: "TimestampProto" + java_multiple_files: true + go_package: "github.com/golang/protobuf/ptypes/timestamp" + cc_enable_arenas: true + objc_class_prefix: "GPB" + csharp_namespace: "Google.Protobuf.WellKnownTypes" + } + syntax: "proto3" +} +file { + name: "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto" + package: "containerd.runhcs.v1" + dependency: "gogoproto/gogo.proto" + dependency: "google/protobuf/timestamp.proto" + message_type { + name: "Options" + field { + name: "debug" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_BOOL + json_name: "debug" + } + field { + name: "debug_type" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_ENUM + type_name: ".containerd.runhcs.v1.Options.DebugType" + json_name: "debugType" + } + field { + name: "registry_root" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "registryRoot" + } + field { + name: "sandbox_image" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "sandboxImage" + } + field { + name: "sandbox_platform" + number: 5 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "sandboxPlatform" + } + field { + name: "sandbox_isolation" + number: 6 + label: LABEL_OPTIONAL + type: TYPE_ENUM + type_name: ".containerd.runhcs.v1.Options.SandboxIsolation" + json_name: "sandboxIsolation" + } + field { + name: "boot_files_root_path" + number: 7 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "bootFilesRootPath" + } + field { + name: "vm_processor_count" + number: 8 + label: LABEL_OPTIONAL + type: TYPE_INT32 + json_name: "vmProcessorCount" + } + field { + name: "vm_memory_size_in_mb" + number: 9 + label: LABEL_OPTIONAL + type: TYPE_INT32 + json_name: "vmMemorySizeInMb" + } + enum_type { + name: "DebugType" + value { + name: "NPIPE" + number: 0 + } + value { + name: "FILE" + number: 1 + } + value { + name: "ETW" + number: 2 + } + } + enum_type { + name: "SandboxIsolation" + value { + name: "PROCESS" + number: 0 + } + value { + name: "HYPERVISOR" + number: 1 + } + } + } + message_type { + name: "ProcessDetails" + field { + name: "image_name" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "imageName" + } + field { + name: "created_at" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Timestamp" + options { + 65001: 0 + 65010: 1 + } + json_name: "createdAt" + } + field { + name: "kernel_time_100_ns" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_UINT64 + json_name: "kernelTime100Ns" + } + field { + name: "memory_commit_bytes" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_UINT64 + json_name: "memoryCommitBytes" + } + field { + name: "memory_working_set_private_bytes" + number: 5 + label: LABEL_OPTIONAL + type: TYPE_UINT64 + json_name: "memoryWorkingSetPrivateBytes" + } + field { + name: "memory_working_set_shared_bytes" + number: 6 + label: LABEL_OPTIONAL + type: TYPE_UINT64 + json_name: "memoryWorkingSetSharedBytes" + } + field { + name: "process_id" + number: 7 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "processId" + } + field { + name: "user_time_100_ns" + number: 8 + label: LABEL_OPTIONAL + type: TYPE_UINT64 + json_name: "userTime100Ns" + } + field { + name: "exec_id" + number: 9 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "execId" + } + } + options { + go_package: "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options;options" + } + weak_dependency: 0 + syntax: "proto3" } \ No newline at end of file diff --git a/test/vendor/github.com/sirupsen/logrus/appveyor.yml b/test/vendor/github.com/sirupsen/logrus/appveyor.yml index 96c2ce15f8..b4ffca2758 100644 --- a/test/vendor/github.com/sirupsen/logrus/appveyor.yml +++ b/test/vendor/github.com/sirupsen/logrus/appveyor.yml @@ -1,14 +1,14 @@ -version: "{build}" -platform: x64 -clone_folder: c:\gopath\src\github.com\sirupsen\logrus -environment: - GOPATH: c:\gopath -branches: - only: - - master -install: - - set PATH=%GOPATH%\bin;c:\go\bin;%PATH% - - go version -build_script: - - go get -t - - go test +version: "{build}" +platform: x64 +clone_folder: c:\gopath\src\github.com\sirupsen\logrus +environment: + GOPATH: c:\gopath +branches: + only: + - master +install: + - set PATH=%GOPATH%\bin;c:\go\bin;%PATH% + - go version +build_script: + - go get -t + - go test diff --git a/vendor/github.com/sirupsen/logrus/appveyor.yml b/vendor/github.com/sirupsen/logrus/appveyor.yml index 96c2ce15f8..b4ffca2758 100644 --- a/vendor/github.com/sirupsen/logrus/appveyor.yml +++ b/vendor/github.com/sirupsen/logrus/appveyor.yml @@ -1,14 +1,14 @@ -version: "{build}" -platform: x64 -clone_folder: c:\gopath\src\github.com\sirupsen\logrus -environment: - GOPATH: c:\gopath -branches: - only: - - master -install: - - set PATH=%GOPATH%\bin;c:\go\bin;%PATH% - - go version -build_script: - - go get -t - - go test +version: "{build}" +platform: x64 +clone_folder: c:\gopath\src\github.com\sirupsen\logrus +environment: + GOPATH: c:\gopath +branches: + only: + - master +install: + - set PATH=%GOPATH%\bin;c:\go\bin;%PATH% + - go version +build_script: + - go get -t + - go test