US77587: Added attribute reader factory and connector to arbitrary attribute store #91

irinaepshteyn · 2017-02-23T22:57:05Z

No description provided.

irinaepshteyn · 2017-02-23T23:11:26Z

All tests PASSED:
https://predix1.jenkins.build.ge.com/job/Predix-Security/job/ACS/job/ACS-PullRequest/job/acs-build-pullrequest/47/

FrankGasparovic · 2017-02-23T23:47:13Z

service/src/main/java/com/ge/predix/acs/attribute/connectors/ZoneConfiguration.java

@@ -0,0 +1,29 @@
+    package com.ge.predix.acs.attribute.connectors;


Remove extra space

FrankGasparovic · 2017-02-23T23:48:31Z

service/src/main/java/com/ge/predix/acs/attribute/connectors/ZoneConfiguration.java

+    @Autowired
+    private DefaultSubjectAttributeReader defaultSubjectAttributeReader;
+
+    private AttributeReader resourceAttributeReader;


No setters or getters and also not wiring the bean, how will we use the resourceAttributeReader?

The idea is to construct resourceAttributeReader based on zone configuration read from the database.

FrankGasparovic · 2017-02-23T23:51:49Z

service/src/main/java/com/ge/predix/acs/attribute/connectors/ZoneConfiguration.java

+    private AttributeReader resourceAttributeReader;
+    private SubjectAttributeReader subjectAttributeReader;
+
+    public AttributeReader getResourceAttributeReader(final String zoneId) {


Is this zoneId as an argument a stub for when we will lookup the which attributeReader to use from the persistent store?

When we are ready to persist zone configuration, zoneId will be used to read zone configuration from the database

sanjeevchopra · 2017-02-24T04:00:36Z

...e/src/main/java/com/ge/predix/acs/service/policy/evaluation/PolicyEvaluationServiceImpl.java

    private PolicySetValidator policySetValidator;
    @Autowired
    private ZoneResolver zoneResolver;
+    @Autowired


ZoneConfiguration or ZoneId can be directly loaded from spring authentication, This will avoid any changes to higher layers and pushing this info downstream.
((ZoneOAuth2Authentication) SecurityContextHolder.getContext().getAuthentication()).getZoneId()

sanjeevchopra · 2017-02-24T04:13:00Z

service/src/main/java/com/ge/predix/acs/attribute/connectors/InMemoryAttributeStore.java

+import com.ge.predix.acs.model.Attribute;
+
+@Component
+public class InMemoryAttributeStore {


This class is unnecessary - InMemoryStoreAdapter can simply hold a map within it.

sanjeevchopra · 2017-02-24T04:21:28Z

service/src/main/java/com/ge/predix/acs/attribute/connectors/InMemoryAttributeStoreAdapter.java

+
+import com.ge.predix.acs.model.Attribute;
+
+public class InMemoryAttributeStoreAdapter implements AttributeStoreAdapter {


In hindsight, because the adapter really belongs outside ACS, this story should just have the initial CustomResourceAttributeReader return a fixed set of attributes. (Or the policy evaluation test can mock the attributeReader)
The key part of this story is the Evaluation test you, wrote and changes in evaluation code path to use a CustomResourceAttributeReader

sanjeevchopra · 2017-02-24T04:42:04Z

service/src/main/java/com/ge/predix/acs/attribute/connectors/CustomResourceAttributeReader.java

+
+import com.ge.predix.acs.model.Attribute;
+
+public class CustomResourceAttributeReader implements AttributeReader {


more thoughts on naming :)
AttributeReader is how its consumers use it. The classes which implement them can be different things. e.g.

ResourceAttributeConnector implements AttributeReader

PrivilegeManagementServiceImpl implements PrivilegeManagementService, AttributeReader, SubjectAttributeReader (this also means we can get rid of DefaultSubjectAttributeReader and DefaultResourceAttributeReader)

sanjeevchopra · 2017-02-24T04:55:53Z

service/src/main/java/com/ge/predix/acs/attribute/connectors/ZoneConfiguration.java

+import org.springframework.stereotype.Component;
+
+@Component
+public class ZoneConfiguration {


Configuration will be fleshed out in the next story - most likely these 2 fields will become part of ZoneEntity class, and link to a ConnectorConfiguration JPAEntity.

anubhavi25 · 2017-02-24T16:43:47Z

service/src/main/java/com/ge/predix/acs/attribute/connectors/AttributeReader.java


 public interface AttributeReader {
-    Set<Attribute> getAttributes(String identifier);
+    Set<Attribute> getAttributes(final String identifier);


Concrete classes implementing interface methods should declare the parameters as final so this is a redundant use of it. This is also supposed to be enforced by our CheckStyle rules via the RedundantModifier module but it's not due to a bug in the version of CheckStyle we're using. As part of DE22352 I've updated to the latest version of CheckStyle on the develop branch so please rebase this branch onto develop and rebuild; once you do so you'll see this issue being flagged properly.

anubhavi25 · 2017-02-24T16:54:53Z

service/src/main/java/com/ge/predix/acs/attribute/connectors/AttributeStoreAdapter.java

+import com.ge.predix.acs.model.Attribute;
+
+public interface AttributeStoreAdapter {
+    Set<Attribute> getAttributes(final String identifier);


See comment re. redundant use of final in interface methods

anubhavi25 · 2017-02-24T16:55:06Z

service/src/main/java/com/ge/predix/acs/attribute/connectors/SubjectAttributeReader.java


 public interface SubjectAttributeReader extends AttributeReader {
-    Set<Attribute> getAttributesByScope(String identifier, Set<Attribute> scopes);
+    Set<Attribute> getAttributesByScope(final String identifier, final Set<Attribute> scopes);


See comment re. redundant use of final in interface methods

anubhavi25 · 2017-02-27T17:06:18Z

service/src/main/java/com/ge/predix/acs/attribute/connectors/ResourceAttributeReader.java

@@ -0,0 +1,5 @@
+package com.ge.predix.acs.attribute.connectors;
+
+public interface ResourceAttributeReader extends AttributeReader {


Do we anticipate adding more functionality to this interface in the immediate future?

If so, maybe put a comment saying that it shouldn't be refactored out?

If not, should we delete this interface and replace implements ResourceAttributeReader with implements AttributeReader everywhere?

Decided to be explicit for code readability

sanjeevchopra

@irinaepshteyn this branch is ready for merge, imo. please review.

…d by AttributeReaderFactory. Signed-off-by: Irina <[email protected]>

irinaepshteyn assigned sanjeevchopra and FrankGasparovic Feb 23, 2017

FrankGasparovic suggested changes Feb 24, 2017

View reviewed changes

sanjeevchopra suggested changes Feb 24, 2017

View reviewed changes

anubhavi25 suggested changes Feb 24, 2017

View reviewed changes

irinaepshteyn force-pushed the US77587 branch from 87c044b to 06e0c85 Compare February 26, 2017 22:38

irinaepshteyn changed the title ~~US77587: Added attribute reader and adapter for in-memory attribute s…~~ US77587: Added attribute reader factory and connector to arbitrary attribute store Feb 26, 2017

anubhavi25 approved these changes Feb 27, 2017

View reviewed changes

anubhavi25 reviewed Feb 27, 2017

View reviewed changes

sanjeevchopra approved these changes Feb 28, 2017

View reviewed changes

[US77587] Updated Policy evaluation to use a attribute reader provide…

21f85b4

…d by AttributeReaderFactory. Signed-off-by: Irina <[email protected]>

sanjeevchopra force-pushed the US77587 branch from b5a8987 to 21f85b4 Compare February 28, 2017 19:09

sanjeevchopra merged commit 7ad86a3 into develop Feb 28, 2017

sanjeevchopra deleted the US77587 branch March 27, 2017 21:41

		@@ -0,0 +1,29 @@
		package com.ge.predix.acs.attribute.connectors;


		import com.ge.predix.acs.model.Attribute;

		public class InMemoryAttributeStoreAdapter implements AttributeStoreAdapter {


		import com.ge.predix.acs.model.Attribute;

		public class CustomResourceAttributeReader implements AttributeReader {

		@@ -0,0 +1,5 @@
		package com.ge.predix.acs.attribute.connectors;

		public interface ResourceAttributeReader extends AttributeReader {

US77587: Added attribute reader factory and connector to arbitrary attribute store #91

US77587: Added attribute reader factory and connector to arbitrary attribute store #91

Uh oh!

Conversation

irinaepshteyn commented Feb 23, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

irinaepshteyn commented Feb 23, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

anubhavi25 Feb 24, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sanjeevchopra left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

irinaepshteyn commented Feb 23, 2017 •

edited

Loading

anubhavi25 Feb 24, 2017 •

edited

Loading

sanjeevchopra left a comment •

edited

Loading