Skip to content

Commit

Permalink
Ensure SplunkJenkinsInstallation.load calculates metadataItemSet
Browse files Browse the repository at this point in the history
  • Loading branch information
jglick committed Sep 29, 2023
1 parent 9a47095 commit 34cf45b
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,19 @@ public class SplunkJenkinsInstallation extends GlobalConfiguration {

public SplunkJenkinsInstallation(boolean useConfigFile) {
if (useConfigFile) {
super.load();
migrate();
//load default metadata
try (InputStream metaInput = this.getClass().getClassLoader().getResourceAsStream("metadata.properties")) {
defaultMetaData = IOUtils.toString(metaInput);
} catch (IOException e) {
//ignore
}
load();
}
}

@Override
public synchronized final void load() {
super.load();
migrate();
//load default metadata
try (InputStream metaInput = this.getClass().getClassLoader().getResourceAsStream("metadata.properties")) {
defaultMetaData = IOUtils.toString(metaInput);
} catch (IOException e) {
//ignore
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
* The MIT License
*
* Copyright 2023 CloudBees, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

package com.splunk.splunkjenkins;

import com.splunk.splunkjenkins.model.EventType;
import com.splunk.splunkjenkins.model.MetaDataConfigItem;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Set;
import jenkins.model.Jenkins;
import org.apache.commons.io.FileUtils;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;

public final class SplunkJenkinsInstallationTest {

@Rule
public final JenkinsRule r = new JenkinsRule();

@Test
public void reload() throws Exception {
SplunkJenkinsInstallation cfg = SplunkJenkinsInstallation.get();
cfg.setMetadataItemSet(Collections.singleton(new MetaDataConfigItem(EventType.BUILD_EVENT.toString(), "index", "value000")));
cfg.save();
File xmlFile = new File(Jenkins.get().getRootDir(), cfg.getId() + ".xml");
String xml = FileUtils.readFileToString(xmlFile, StandardCharsets.UTF_8);
assertThat(xml, containsString("value000"));
xml = xml.replace("value000", "value999");
FileUtils.writeStringToFile(xmlFile, xml, StandardCharsets.UTF_8);
cfg.load();
Set<MetaDataConfigItem> metadataItemSet = cfg.getMetadataItemSet();
assertThat(metadataItemSet, hasSize(1));
assertThat(metadataItemSet.iterator().next().getValue(), is("value999"));
}

}

0 comments on commit 34cf45b

Please sign in to comment.