4 files changed, 3 insertions, 114 deletions
diff --git a/pkg/shim/runtimeoptions/BUILD b/pkg/shim/runtimeoptions/BUILD
deleted file mode 100644
index 029be7c09..000000000
--- a/pkg/shim/runtimeoptions/BUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-load("//tools:defs.bzl", "go_library", "go_test", "proto_library")
-
-package(licenses = ["notice"])
-
-proto_library(
-    name = "api",
-    srcs = [
-        "runtimeoptions.proto",
-    ],
-)
-
-go_library(
-    name = "runtimeoptions",
-    srcs = [
-        "runtimeoptions.go",
-        "runtimeoptions_cri.go",
-    ],
-    visibility = ["//pkg/shim:__pkg__"],
-    deps = ["@com_github_gogo_protobuf//proto:go_default_library"],
-)
-
-go_test(
-    name = "runtimeoptions_test",
-    size = "small",
-    srcs = ["runtimeoptions_test.go"],
-    library = ":runtimeoptions",
-    deps = [
-        "@com_github_containerd_containerd//runtime/v1/shim/v1:go_default_library",
-        "@com_github_containerd_typeurl//:go_default_library",
-        "@com_github_gogo_protobuf//proto:go_default_library",
-    ],
-)
diff --git a/pkg/shim/runtimeoptions/runtimeoptions.proto b/pkg/shim/runtimeoptions/runtimeoptions.proto
deleted file mode 100644
index 057032e34..000000000
--- a/pkg/shim/runtimeoptions/runtimeoptions.proto
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2020 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package cri.runtimeoptions.v1;
-
-// This is a version of the runtimeoptions CRI API that is vendored.
-//
-// Importing the full CRI package is a nightmare.
-message Options {
-  string type_url = 1;
-  string config_path = 2;
-}
diff --git a/pkg/shim/runtimeoptions/runtimeoptions_state_autogen.go b/pkg/shim/runtimeoptions/runtimeoptions_state_autogen.go
new file mode 100644
index 000000000..f5c883045
--- /dev/null
+++ b/pkg/shim/runtimeoptions/runtimeoptions_state_autogen.go
@@ -0,0 +1,3 @@
+// automatically generated by stateify.
+
+package runtimeoptions
diff --git a/pkg/shim/runtimeoptions/runtimeoptions_test.go b/pkg/shim/runtimeoptions/runtimeoptions_test.go
deleted file mode 100644
index c59a2400e..000000000
--- a/pkg/shim/runtimeoptions/runtimeoptions_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2020 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package runtimeoptions
-
-import (
-	"bytes"
-	"testing"
-
-	shim "github.com/containerd/containerd/runtime/v1/shim/v1"
-	"github.com/containerd/typeurl"
-	"github.com/gogo/protobuf/proto"
-)
-
-func TestCreateTaskRequest(t *testing.T) {
-	// Serialize the top-level message.
-	const encodedText = `options: <
-  type_url: "cri.runtimeoptions.v1.Options"
-  value: "\n\010type_url\022\013config_path"
->`
-	got := &shim.CreateTaskRequest{} // Should have raw options.
-	if err := proto.UnmarshalText(encodedText, got); err != nil {
-		t.Fatalf("unable to unmarshal text: %v", err)
-	}
-	var textBuffer bytes.Buffer
-	if err := proto.MarshalText(&textBuffer, got); err != nil {
-		t.Errorf("unable to marshal text: %v", err)
-	}
-	t.Logf("got: %s", string(textBuffer.Bytes()))
-
-	// Check the options.
-	wantOptions := &Options{}
-	wantOptions.TypeUrl = "type_url"
-	wantOptions.ConfigPath = "config_path"
-	gotMessage, err := typeurl.UnmarshalAny(got.Options)
-	if err != nil {
-		t.Fatalf("unable to unmarshal any: %v", err)
-	}
-	gotOptions, ok := gotMessage.(*Options)
-	if !ok {
-		t.Fatalf("got %v, want %v", gotMessage, wantOptions)
-	}
-	if !proto.Equal(gotOptions, wantOptions) {
-		t.Fatalf("got %v, want %v", gotOptions, wantOptions)
-	}
-}