Skip to content

Commit

Permalink
Use pnc ide-config
Browse files Browse the repository at this point in the history
  • Loading branch information
rnc authored and thescouser89 committed Feb 26, 2025
1 parent 7fa78f0 commit bab376a
Show file tree
Hide file tree
Showing 267 changed files with 1,809 additions and 1,940 deletions.
22 changes: 12 additions & 10 deletions auth/src/main/java/org/jboss/pnc/bacon/auth/KeycloakClientImpl.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package org.jboss.pnc.bacon.auth;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.time.Instant;
import java.util.Optional;

import javax.net.ssl.SSLHandshakeException;

import kong.unirest.HttpResponse;
import kong.unirest.MultipartBody;
import kong.unirest.Unirest;
Expand All @@ -12,6 +15,7 @@
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

import org.jboss.pnc.bacon.auth.model.CacheFile;
import org.jboss.pnc.bacon.auth.model.Credential;
import org.jboss.pnc.bacon.auth.model.KeycloakResponse;
Expand All @@ -20,12 +24,10 @@
import org.keycloak.adapters.installed.KeycloakInstalled;
import org.keycloak.representations.AccessToken;

import javax.net.ssl.SSLHandshakeException;

import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.time.Instant;
import java.util.Optional;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;

/**
* Authenticates to Keycloak using direct flow!
Expand Down
20 changes: 11 additions & 9 deletions auth/src/main/java/org/jboss/pnc/bacon/auth/model/CacheFile.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
package org.jboss.pnc.bacon.auth.model;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.jboss.pnc.bacon.common.Constant;
import org.jboss.pnc.bacon.config.Config;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
Expand All @@ -21,6 +12,17 @@
import java.util.Optional;
import java.util.Set;

import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;

import org.apache.commons.codec.digest.DigestUtils;
import org.jboss.pnc.bacon.common.Constant;
import org.jboss.pnc.bacon.config.Config;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;

@Getter
@Setter
@Slf4j
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package org.jboss.pnc.bacon.auth.model;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
import java.time.Instant;
import java.time.temporal.ChronoUnit;

import lombok.Builder;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

import java.time.Instant;
import java.time.temporal.ChronoUnit;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;

@Data
@Builder(toBuilder = true, builderClassName = "Builder")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package org.jboss.pnc.bacon.auth.model;

import lombok.Data;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;

@Data
@JsonIgnoreProperties(ignoreUnknown = true)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.jboss.pnc.bacon.auth;

import static org.junit.jupiter.api.Assertions.*;

import org.jboss.pnc.bacon.auth.spi.KeycloakClient;
import org.jboss.pnc.bacon.common.exception.FatalException;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.*;

class KeycloakClientImplTest {

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.codehaus.plexus.logging.console;

import lombok.extern.slf4j.Slf4j;

import org.codehaus.plexus.logging.AbstractLogger;
import org.codehaus.plexus.logging.Logger;

Expand Down
28 changes: 16 additions & 12 deletions cli/src/main/java/org/jboss/pnc/bacon/cli/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@
*/
package org.jboss.pnc.bacon.cli;

import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.ConsoleAppender;
import com.redhat.resilience.otel.OTelCLIHelper;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanContext;
import static picocli.CommandLine.ScopeType.INHERIT;

import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;

import lombok.extern.slf4j.Slf4j;

import org.fusesource.jansi.AnsiConsole;
import org.jboss.bacon.da.Da;
import org.jboss.bacon.experimental.Experimental;
Expand Down Expand Up @@ -54,17 +53,22 @@
import org.jline.terminal.TerminalBuilder;
import org.jline.widget.TailTipWidgets;
import org.slf4j.LoggerFactory;

import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.IExecutionExceptionHandler;
import picocli.CommandLine.Option;
import picocli.shell.jline3.PicocliCommands;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.ConsoleAppender;

import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import com.redhat.resilience.otel.OTelCLIHelper;

import static picocli.CommandLine.ScopeType.INHERIT;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanContext;

/**
* @author Michal Szynkiewicz, [email protected] <br>
Expand Down
23 changes: 12 additions & 11 deletions cli/src/test/java/org/jboss/pnc/bacon/cli/AppTest.java
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
package org.jboss.pnc.bacon.cli;

import ch.qos.logback.classic.Level;
import ch.qos.logback.core.pattern.color.ANSIConstants;
import org.apache.commons.io.FilenameUtils;
import org.jboss.pnc.bacon.common.ObjectHelper;
import org.junit.jupiter.api.Test;

import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import static com.github.stefanbirkner.systemlambda.SystemLambda.restoreSystemProperties;
import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemErr;
import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOut;
import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;

import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import org.apache.commons.io.FilenameUtils;
import org.jboss.pnc.bacon.common.ObjectHelper;
import org.junit.jupiter.api.Test;

import ch.qos.logback.classic.Level;
import ch.qos.logback.core.pattern.color.ANSIConstants;

class AppTest {

private static final String PNC_TEST_CLASSES = FilenameUtils.separatorsToSystem("pnc/target/test-classes");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;

import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@
*/
package org.jboss.pnc.bacon.common.cli;

import java.util.Collection;

import org.jboss.pnc.client.RemoteResourceException;
import org.jboss.pnc.dto.Build;
import org.jboss.pnc.rest.api.parameters.BuildsFilterParameters;
import picocli.CommandLine.Option;

import java.util.Collection;
import picocli.CommandLine.Option;

/**
* Class used to provide a default implementation for List* type commands.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,17 @@
*/
package org.jboss.pnc.bacon.common.cli;

import com.fasterxml.jackson.core.JsonProcessingException;
import java.util.concurrent.Callable;

import lombok.extern.slf4j.Slf4j;

import org.jboss.pnc.bacon.common.ObjectHelper;
import org.jboss.pnc.bacon.common.exception.FatalException;
import org.jboss.pnc.client.ClientException;

import picocli.CommandLine.Parameters;

import java.util.concurrent.Callable;
import com.fasterxml.jackson.core.JsonProcessingException;

/**
* Class used to get specific item from PNC. The subclass only has to implement 'getSpecific' to teach it how to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,19 @@
*/
package org.jboss.pnc.bacon.common.cli;

import com.fasterxml.jackson.core.JsonProcessingException;
import java.util.Collection;
import java.util.concurrent.Callable;

import lombok.extern.slf4j.Slf4j;

import org.jboss.pnc.bacon.common.ObjectHelper;
import org.jboss.pnc.bacon.common.exception.FatalException;
import org.jboss.pnc.client.ClientException;
import org.jboss.pnc.client.RemoteResourceException;

import picocli.CommandLine.Option;

import java.util.Collection;
import java.util.concurrent.Callable;
import com.fasterxml.jackson.core.JsonProcessingException;

/**
* Class used to provide a default implementation for List* type commands.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package org.jboss.pnc.bacon.common.cli;

import lombok.extern.slf4j.Slf4j;

import org.jboss.pnc.bacon.common.Constant;
import org.jboss.pnc.bacon.common.exception.FatalException;

import picocli.CommandLine;
import picocli.CommandLine.Model.CommandSpec;
import picocli.CommandLine.Spec;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.jboss.pnc.bacon.common.cli;

import org.commonjava.maven.ext.common.util.ManifestUtils;

import picocli.CommandLine;

public class VersionProvider implements CommandLine.IVersionProvider {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package org.jboss.pnc.bacon.common;

import ch.qos.logback.classic.Level;
import org.junit.jupiter.api.Test;
import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOut;
import static org.junit.jupiter.api.Assertions.*;

import java.util.HashMap;
import java.util.Map;

import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOut;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;

import ch.qos.logback.classic.Level;

class ObjectHelperTest {

Expand Down
13 changes: 7 additions & 6 deletions config/src/main/java/org/jboss/pnc/bacon/config/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@
*/
package org.jboss.pnc.bacon.config;

import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
import java.util.stream.Collectors;

import lombok.Data;
import lombok.extern.slf4j.Slf4j;

import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;

/**
* @author Michal Szynkiewicz, [email protected] <br>
* Date: 12/14/18
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
*/
package org.jboss.pnc.bacon.config;

import lombok.Data;

import java.util.Map;

import lombok.Data;

@Data
public class ConfigProfile {

Expand Down
4 changes: 2 additions & 2 deletions config/src/main/java/org/jboss/pnc/bacon/config/Validate.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.jboss.pnc.bacon.config;

import javax.validation.ConstraintViolation;

import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;

import javax.validation.ConstraintViolation;

public interface Validate {

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package org.jboss.bacon.da;

import io.opentelemetry.api.trace.SpanContext;
import org.jboss.pnc.api.constants.MDCHeaderKeys;
import org.jboss.pnc.common.otel.OtelUtils;
import java.io.IOException;

import javax.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter;

import java.io.IOException;
import org.jboss.pnc.api.constants.MDCHeaderKeys;
import org.jboss.pnc.common.otel.OtelUtils;

import io.opentelemetry.api.trace.SpanContext;

public class CustomRestHeaderFilter implements ClientRequestFilter {

Expand Down
Loading

0 comments on commit bab376a

Please sign in to comment.