adaptation: add a version exchange test.

Add version exchange test and related test option to adaptation.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>

Author: klihub

pkg/adaptation/adaptation_suite_test.go

@@ -3310,6 +3310,39 @@ var _ = Describe("Plugin configuration request", func() {
 	})
 })
 
+var _ = Describe("NRI version exchange", func() {
+	var (
+		s = &Suite{}
+	)
+
+	AfterEach(func() {
+		s.Cleanup()
+	})
+
+	BeforeEach(func() {
+		s.Prepare(&mockRuntime{}, &mockPlugin{idx: "00", name: "test"})
+	})
+
+	It("should pass runtime version information to plugins", func() {
+		var (
+			runtimeName    = "test-runtime"
+			runtimeVersion = "1.2.3"
+			nriVersion     = "v9.8.7"
+		)
+
+		s.runtime.name = runtimeName
+		s.runtime.version = runtimeVersion
+		s.runtime.options = append(s.runtime.options, nri.WithTestNRIVersion(nriVersion))
+
+		s.Startup()
+
+		Expect(s.plugins[0].RuntimeName()).To(Equal(runtimeName))
+		Expect(s.plugins[0].RuntimeVersion()).To(Equal(runtimeVersion))
+		Expect(s.plugins[0].RuntimeNRIVersion()).To(Equal(nriVersion))
+	})
+
+})
+
 func protoDiff(a, b proto.Message) string {
 	return cmp.Diff(a, b, protocmp.Transform())
 }

pkg/adaptation/helpers_test.go

@@ -0,0 +1,26 @@
+/*
+   Copyright The containerd 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
+
+       http://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 adaptation
+
+// WithTestNRIVersion is an option to override the local NRI version
+// for testing purposes.
+func WithTestNRIVersion(v string) Option {
+	return func(r *Adaptation) error {
+		r.nriVersion = v
+		return nil
+	}
+}

pkg/adaptation/suite_test.go

@@ -366,10 +366,11 @@ func (m *mockRuntime) update(ctx context.Context, updates []*nri.ContainerUpdate
 }
 
 type mockPlugin struct {
-	name string
-	idx  string
-	stub stub.Stub
-	mask stub.EventMask
+	name    string
+	idx     string
+	stub    stub.Stub
+	mask    stub.EventMask
+	options []stub.Option
 
 	runtime string
 	version string
@@ -457,10 +458,12 @@ func (m *mockPlugin) Init(dir string) error {
 	m.Log("Init()...")
 
 	m.stub, err = stub.New(m,
-		stub.WithPluginName(m.name),
-		stub.WithPluginIdx(m.idx),
-		stub.WithSocketPath(filepath.Join(dir, "nri.sock")),
-		stub.WithOnClose(m.onClose),
+		append(m.options,
+			stub.WithPluginName(m.name),
+			stub.WithPluginIdx(m.idx),
+			stub.WithSocketPath(filepath.Join(dir, "nri.sock")),
+			stub.WithOnClose(m.onClose),
+		)...,
 	)
 	if err != nil {
 		m.q.Add(PluginCreationError)
@@ -548,6 +551,13 @@ func (m *mockPlugin) RuntimeVersion() string {
 	return m.version
 }
 
+func (m *mockPlugin) RuntimeNRIVersion() string {
+	if m.stub == nil {
+		return ""
+	}
+	return m.stub.RuntimeNRIVersion()
+}
+
 func (m *mockPlugin) onClose() {
 	if m.stub != nil {
 		m.stub.Stop()

pkg/version/version_test.go

@@ -58,6 +58,21 @@ func TestStripGitSuffix(t *testing.T) {
 			version:  "v0.11.0-37-g41b9c58",
 			expected: "v0.11.0",
 		},
+		{
+			name:     "prerelease version",
+			version:  "v1.2.3-45",
+			expected: "v1.2.3-45",
+		},
+		{
+			name:     "prerelease version, looking more like a git suffix",
+			version:  "v1.2.3-45-g",
+			expected: "v1.2.3-45-g",
+		},
+		{
+			name:     "another prerelease version",
+			version:  "v1.2.3-45-gz",
+			expected: "v1.2.3-45-gz",
+		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			stripped := stripGitSuffix(tc.version)
@@ -149,6 +164,12 @@ func TestFindClosestMatch(t *testing.T) {
 			candidates: candidates,
 			expected:   "v0.10.9",
 		},
+		{
+			name:       "another closest match for a working tree version",
+			version:    "v0.10.9-37-g41b9c58",
+			candidates: candidates,
+			expected:   "v0.10.9",
+		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			match := FindClosestMatch(tc.version, tc.candidates)