From ccfd5aa96619e9be92ff560c9886c2f3c9fcb183 Mon Sep 17 00:00:00 2001
From: Lee Hinman <lee@writequit.org>
Date: Mon, 9 Sep 2019 09:48:30 -0600
Subject: [PATCH] Fix SnapshotLifecycleMetadata xcontent serialization

This adds the missing xcontent parser for the operation_mode of SLM. It
also adds serialization test for the class.

Resolves #46499
---
 .../core/slm/SnapshotLifecycleMetadata.java   |  1 +
 .../slm/SnapshotLifecycleMetadataTests.java   | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadataTests.java

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadata.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadata.java
index 7c64a0c3b9bd8..2c5bb95a7792b 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadata.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadata.java
@@ -56,6 +56,7 @@ public class SnapshotLifecycleMetadata implements XPackMetaDataCustom {
             v -> {
                 throw new IllegalArgumentException("ordered " + POLICIES_FIELD.getPreferredName() + " are not supported");
             }, POLICIES_FIELD);
+        PARSER.declareString(ConstructingObjectParser.constructorArg(), OPERATION_MODE_FIELD);
     }
 
     private final Map<String, SnapshotLifecyclePolicyMetadata> snapshotConfigurations;
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadataTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadataTests.java
new file mode 100644
index 0000000000000..8fcb972bce2dc
--- /dev/null
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadataTests.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+package org.elasticsearch.xpack.core.slm;
+
+import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.test.AbstractSerializingTestCase;
+import org.elasticsearch.xpack.core.ilm.OperationMode;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class SnapshotLifecycleMetadataTests extends AbstractSerializingTestCase<SnapshotLifecycleMetadata> {
+    @Override
+    protected SnapshotLifecycleMetadata doParseInstance(XContentParser parser) throws IOException {
+        return SnapshotLifecycleMetadata.PARSER.apply(parser, null);
+    }
+
+    @Override
+    protected SnapshotLifecycleMetadata createTestInstance() {
+        int policyCount = randomIntBetween(0, 3);
+        Map<String, SnapshotLifecyclePolicyMetadata> policies = new HashMap<>(policyCount);
+        for (int i = 0; i < policyCount; i++) {
+            String id = "policy-" + randomAlphaOfLength(3);
+            policies.put(id, SnapshotLifecyclePolicyMetadataTests.createRandomPolicyMetadata(id));
+        }
+        return new SnapshotLifecycleMetadata(policies, randomFrom(OperationMode.values()));
+    }
+
+    @Override
+    protected Writeable.Reader<SnapshotLifecycleMetadata> instanceReader() {
+        return SnapshotLifecycleMetadata::new;
+    }
+}