[17/34] ambari git commit: AMBARI-20807 Log Search REST API calls for configuration should send proper error responses (mgergely)

2017-04-26 Thread jonathanhurley 
AMBARI-20807 Log Search REST API calls for configuration should send proper 
error responses (mgergely)

Change-Id: I23595470db557a5fa746fd02cb51caa35d96a44f


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8e997a3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8e997a3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8e997a3

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: e8e997a36e38a38ac7ca4695377ba800a8427f87
Parents: 1b7c023
Author: Miklos Gergely 
Authored: Tue Apr 25 15:53:37 2017 +0200
Committer: Miklos Gergely 
Committed: Tue Apr 25 15:53:37 2017 +0200

--
 .../ambari/logsearch/common/MessageEnums.java   |   3 +-
 .../ambari/logsearch/conf/SecurityConfig.java   |  15 +++
 .../logsearch/manager/ShipperConfigManager.java |  19 
 .../logsearch/rest/ShipperConfigResource.java   |   4 +-
 .../web/filters/LogSearchConfigStateFilter.java | 102 +++
 .../scripts/logsearch_config_aggregator.py  |  77 --
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |   3 -
 7 files changed, 121 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e997a3/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/MessageEnums.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/MessageEnums.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/MessageEnums.java
index 4f1725f..9dd8b34 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/MessageEnums.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/MessageEnums.java
@@ -33,7 +33,8 @@ public enum MessageEnums {
   ZNODE_NOT_READY("logsearch.zk.znode.error", "ZNode is not available."),
   ZK_CONFIG_NOT_READY("logsearch.zk.config.error", "Collection configuration 
has not uploaded yet"),
   SOLR_COLLECTION_NOT_READY("logsearch.solr.collection.error", "Solr has not 
accessible yet for collection."),
-
+  CONFIGURATION_NOT_AVAILABLE("logsearch.config.not_available", "Log Search 
configuration is not available"),
+  
   // Common Validations
   INVALID_PASSWORD("logsearch.validation.invalid_password", "Invalid 
password"),
   INVALID_INPUT_DATA("logsearch.validation.invalid_input_data", "Invalid input 
data"),

http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e997a3/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
index 2f9cba4..973dc4b 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
@@ -19,6 +19,8 @@
 package org.apache.ambari.logsearch.conf;
 
 import com.google.common.collect.Lists;
+
+import org.apache.ambari.logsearch.conf.global.LogSearchConfigState;
 import org.apache.ambari.logsearch.conf.global.SolrCollectionState;
 import 
org.apache.ambari.logsearch.web.authenticate.LogsearchAuthFailureHandler;
 import 
org.apache.ambari.logsearch.web.authenticate.LogsearchAuthSuccessHandler;
@@ -26,6 +28,7 @@ import 
org.apache.ambari.logsearch.web.authenticate.LogsearchLogoutSuccessHandle
 import org.apache.ambari.logsearch.web.filters.LogsearchAuditLogsStateFilter;
 import 
org.apache.ambari.logsearch.web.filters.LogsearchAuthenticationEntryPoint;
 import org.apache.ambari.logsearch.web.filters.LogsearchCorsFilter;
+import org.apache.ambari.logsearch.web.filters.LogSearchConfigStateFilter;
 import 
org.apache.ambari.logsearch.web.filters.LogsearchKRBAuthenticationFilter;
 import org.apache.ambari.logsearch.web.filters.LogsearchJWTFilter;
 import 
org.apache.ambari.logsearch.web.filters.LogsearchSecurityContextFormationFilter;
@@ -82,6 +85,9 @@ public class SecurityConfig extends 
WebSecurityConfigurerAdapter {
   @Named("solrUserConfigState")
   private SolrCollectionState solrUserConfigState;
 
+  @Inject
+  private LogSearchConfigState logSearchConfigState;
+
   @Override
   protected void configure(HttpSecurity http) throws Exception {
 http
@@ -108,6 +114,7 @@ public class SecurityConfig extends 
WebSecurityConfigurerAdapter {

ambari git commit: AMBARI-20807 Log Search REST API calls for configuration should send proper error responses (mgergely)

2017-04-25 Thread mgergely 
Repository: ambari
Updated Branches:
  refs/heads/trunk 1b7c023d0 -> e8e997a36


AMBARI-20807 Log Search REST API calls for configuration should send proper 
error responses (mgergely)

Change-Id: I23595470db557a5fa746fd02cb51caa35d96a44f


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8e997a3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8e997a3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8e997a3

Branch: refs/heads/trunk
Commit: e8e997a36e38a38ac7ca4695377ba800a8427f87
Parents: 1b7c023
Author: Miklos Gergely 
Authored: Tue Apr 25 15:53:37 2017 +0200
Committer: Miklos Gergely 
Committed: Tue Apr 25 15:53:37 2017 +0200

--
 .../ambari/logsearch/common/MessageEnums.java   |   3 +-
 .../ambari/logsearch/conf/SecurityConfig.java   |  15 +++
 .../logsearch/manager/ShipperConfigManager.java |  19 
 .../logsearch/rest/ShipperConfigResource.java   |   4 +-
 .../web/filters/LogSearchConfigStateFilter.java | 102 +++
 .../scripts/logsearch_config_aggregator.py  |  77 --
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |   3 -
 7 files changed, 121 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e997a3/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/MessageEnums.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/MessageEnums.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/MessageEnums.java
index 4f1725f..9dd8b34 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/MessageEnums.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/MessageEnums.java
@@ -33,7 +33,8 @@ public enum MessageEnums {
   ZNODE_NOT_READY("logsearch.zk.znode.error", "ZNode is not available."),
   ZK_CONFIG_NOT_READY("logsearch.zk.config.error", "Collection configuration 
has not uploaded yet"),
   SOLR_COLLECTION_NOT_READY("logsearch.solr.collection.error", "Solr has not 
accessible yet for collection."),
-
+  CONFIGURATION_NOT_AVAILABLE("logsearch.config.not_available", "Log Search 
configuration is not available"),
+  
   // Common Validations
   INVALID_PASSWORD("logsearch.validation.invalid_password", "Invalid 
password"),
   INVALID_INPUT_DATA("logsearch.validation.invalid_input_data", "Invalid input 
data"),

http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e997a3/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
index 2f9cba4..973dc4b 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
@@ -19,6 +19,8 @@
 package org.apache.ambari.logsearch.conf;
 
 import com.google.common.collect.Lists;
+
+import org.apache.ambari.logsearch.conf.global.LogSearchConfigState;
 import org.apache.ambari.logsearch.conf.global.SolrCollectionState;
 import 
org.apache.ambari.logsearch.web.authenticate.LogsearchAuthFailureHandler;
 import 
org.apache.ambari.logsearch.web.authenticate.LogsearchAuthSuccessHandler;
@@ -26,6 +28,7 @@ import 
org.apache.ambari.logsearch.web.authenticate.LogsearchLogoutSuccessHandle
 import org.apache.ambari.logsearch.web.filters.LogsearchAuditLogsStateFilter;
 import 
org.apache.ambari.logsearch.web.filters.LogsearchAuthenticationEntryPoint;
 import org.apache.ambari.logsearch.web.filters.LogsearchCorsFilter;
+import org.apache.ambari.logsearch.web.filters.LogSearchConfigStateFilter;
 import 
org.apache.ambari.logsearch.web.filters.LogsearchKRBAuthenticationFilter;
 import org.apache.ambari.logsearch.web.filters.LogsearchJWTFilter;
 import 
org.apache.ambari.logsearch.web.filters.LogsearchSecurityContextFormationFilter;
@@ -82,6 +85,9 @@ public class SecurityConfig extends 
WebSecurityConfigurerAdapter {
   @Named("solrUserConfigState")
   private SolrCollectionState solrUserConfigState;
 
+  @Inject
+  private LogSearchConfigState logSearchConfigState;
+
   @Override
   protected void configure(HttpSecurity http) throws Exception {
 http
@@ -108,6 +114,7 @@ public class SecurityConfig extends